Support relative height declarations

Add support for relative height declarations
Add tests for relative height declarations
Fix tests that used relative height declarations
Update WidthHeightApplierUtil to take relative table-height into account

DEVSIX-1389

Author: Samuel Huylebroeck

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/AbstractFormFieldRenderer.java

@@ -205,8 +205,8 @@ private LayoutResult layout(LayoutContext layoutContext, boolean minMaxWidth) {
         float parentWidth = layoutContext.getArea().getBBox().getWidth();
         float parentHeight = layoutContext.getArea().getBBox().getHeight();
 
-        Float maxHeight = this.<Float>getProperty(Property.MAX_HEIGHT);
-        Float height = this.<Float>getProperty(Property.HEIGHT);
+        UnitValue maxHeight = this.<UnitValue>getProperty(Property.MAX_HEIGHT);
+        UnitValue height = this.<UnitValue>getProperty(Property.HEIGHT);
         boolean restoreMaxHeight = hasOwnProperty(Property.MAX_HEIGHT);
         boolean restoreHeight = hasOwnProperty(Property.HEIGHT);
         setProperty(Property.MAX_HEIGHT, null);

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/AbstractOneLineTextFieldRenderer.java

@@ -100,7 +100,6 @@ void cropContentLines(List<LineRenderer> lines, Rectangle bBox) {
      * Updates the paragraph height.
      */
     private void updateParagraphHeight() {
-        overrideHeightProperties();
         Float height = retrieveHeight();
         Float minHeight = retrieveMinHeight();
         Float maxHeight = retrieveMaxHeight();

src/main/java/com/itextpdf/html2pdf/css/apply/util/WidthHeightApplierUtil.java

@@ -42,7 +42,6 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.html2pdf.css.apply.util;
 
-import com.itextpdf.html2pdf.LogMessageConstant;
 import com.itextpdf.html2pdf.attach.ProcessorContext;
 import com.itextpdf.html2pdf.css.CssConstants;
 import com.itextpdf.html2pdf.css.util.CssUtils;
@@ -62,7 +61,9 @@ This file is part of the iText (R) project.
  */
 public final class WidthHeightApplierUtil {
 
-    /** The logger. */
+    /**
+     * The logger.
+     */
     private static final Logger logger = LoggerFactory.getLogger(WidthHeightApplierUtil.class);
 
     /**
@@ -75,8 +76,8 @@ private WidthHeightApplierUtil() {
      * Applies a width or a height to an element.
      *
      * @param cssProps the CSS properties
-     * @param context the processor context
-     * @param element the element
+     * @param context  the processor context
+     * @param element  the element
      */
     public static void applyWidthHeight(Map<String, String> cssProps, ProcessorContext context, IPropertyContainer element) {
         float em = CssUtils.parseAbsoluteLength(cssProps.get(CssConstants.FONT_SIZE));
@@ -109,53 +110,44 @@ public static void applyWidthHeight(Map<String, String> cssProps, ProcessorConte
             if (!CssConstants.AUTO.equals(heightVal)) {
                 height = CssUtils.parseLengthValueToPt(heightVal, em, rem);
                 if (height != null) {
-                    if (height.isPointValue()) {
-                        // For tables, height does not have any effect. The height value will be used when
-                        // calculating effective min height value below
-                        if (!applyToTable && !applyToCell) {
-                            element.setProperty(Property.HEIGHT, height.getValue());
-                        }
-                    } else {
-                        logger.error(LogMessageConstant.HEIGHT_VALUE_IN_PERCENT_NOT_SUPPORTED);
+                    // For tables, height does not have any effect. The height value will be used when
+                    // calculating effective min height value below
+                    if (!applyToTable && !applyToCell) {
+                        element.setProperty(Property.HEIGHT, height);
                     }
                 }
             }
         }
 
         String maxHeightVal = cssProps.get(CssConstants.MAX_HEIGHT);
         float maxHeightToApply = 0;
+        UnitValue maxHeight = new UnitValue(UnitValue.POINT, 0);
         if (maxHeightVal != null) {
-            UnitValue maxHeight = CssUtils.parseLengthValueToPt(maxHeightVal, em, rem);
+            maxHeight = CssUtils.parseLengthValueToPt(maxHeightVal, em, rem);
             if (maxHeight != null) {
-                if (maxHeight.isPointValue()) {
-                    // For tables and cells, max height does not have any effect. See also comments below when MIN_HEIGHT is applied.
-                    if (!applyToTable && !applyToCell) {
-                        maxHeightToApply = maxHeight.getValue();
-                    }
-                } else {
-                    logger.error(LogMessageConstant.HEIGHT_VALUE_IN_PERCENT_NOT_SUPPORTED);
+                // For tables and cells, max height does not have any effect. See also comments below when MIN_HEIGHT is applied.
+                if (!applyToTable && !applyToCell) {
+                    maxHeightToApply = maxHeight.getValue();
                 }
             }
         }
         if (maxHeightToApply > 0) {
-            element.setProperty(Property.MAX_HEIGHT, maxHeightToApply);
+            element.setProperty(Property.MAX_HEIGHT, maxHeight);
         }
 
         String minHeightVal = cssProps.get(CssConstants.MIN_HEIGHT);
         float minHeightToApply = 0;
+        UnitValue minHeight = new UnitValue(UnitValue.POINT, 0);
         if (minHeightVal != null) {
-            UnitValue minHeight = CssUtils.parseLengthValueToPt(minHeightVal, em, rem);
+            minHeight = CssUtils.parseLengthValueToPt(minHeightVal, em, rem);
             if (minHeight != null) {
-                if (minHeight.isPointValue()) {
-                    // For cells, min height does not have any effect. See also comments below when MIN_HEIGHT is applied.
-                    if (!applyToCell) {
-                        minHeightToApply = minHeight.getValue();
-                    }
-                } else {
-                    logger.error(LogMessageConstant.HEIGHT_VALUE_IN_PERCENT_NOT_SUPPORTED);
+                // For cells, min height does not have any effect. See also comments below when MIN_HEIGHT is applied.
+                if (!applyToCell) {
+                    minHeightToApply = minHeight.getValue();
                 }
             }
         }
+
         // About tables:
         // The height of a table is given by the 'height' property for the 'table' or 'inline-table' element.
         // A value of 'auto' means that the height is the sum of the row heights plus any cell spacing or borders.
@@ -165,11 +157,15 @@ public static void applyWidthHeight(Map<String, String> cssProps, ProcessorConte
         // The height of a 'table-row' element's box is the maximum of the row's computed 'height', the computed 'height' of each cell in the row,
         // and the minimum height (MIN) required by the cells. MIN depends on cell box heights and cell box alignment.
         // In CSS 2.1, the height of a cell box is the minimum height required by the content.
-        if ((applyToTable || applyToCell) && height != null && height.isPointValue() && height.getValue() > minHeightToApply) {
+        if ((applyToTable || applyToCell) && height != null && height.getValue() > minHeightToApply) {
             minHeightToApply = height.getValue();
-        }
-        if (minHeightToApply > 0) {
-            element.setProperty(Property.MIN_HEIGHT, minHeightToApply);
+            if (minHeightToApply > 0) {
+                element.setProperty(Property.MIN_HEIGHT, height);
+            }
+        } else {
+            if (minHeightToApply > 0) {
+                element.setProperty(Property.MIN_HEIGHT, minHeight);
+            }
         }
 
         if (CssConstants.BORDER_BOX.equals(cssProps.get(CssConstants.BOX_SIZING))) {

src/test/java/com/itextpdf/html2pdf/css/HeightTest.java

@@ -131,6 +131,96 @@ public void heightTest07() throws IOException, InterruptedException {
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
     }
 
+    @Test
+    public void heightTest08() throws IOException, InterruptedException {
+        String testName = "heightTest08";
+        String diffPrefix = "diff08_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
+    @Test
+    public void heightTest09() throws IOException, InterruptedException {
+        String testName = "heightTest09";
+        String diffPrefix = "diff09_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
+    @Test
+    public void heightTest10() throws IOException, InterruptedException {
+        String testName = "heightTest10";
+        String diffPrefix = "diff10_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
+    @Test
+    public void heightTest11() throws IOException, InterruptedException {
+        String testName = "heightTest11";
+        String diffPrefix = "diff11_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
+    @Test
+    public void heightTest12() throws IOException, InterruptedException {
+        String testName = "heightTest12";
+        String diffPrefix = "diff12_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+    
+    @Test
+    public void heightTest13() throws IOException, InterruptedException{
+        String testName = "heightTest13";
+        String diffPrefix = "diff13_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
+    @Test
+    public void heightTest14() throws IOException, InterruptedException{
+        String testName = "heightTest14";
+        String diffPrefix = "diff14_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
+    @Test
+    public void heightTest15() throws IOException, InterruptedException{
+        String testName = "heightTest15";
+        String diffPrefix = "diff15_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
+    @Test
+    public void heightTest16() throws IOException, InterruptedException{
+        String testName = "heightTest16";
+        String diffPrefix = "diff16_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
+    @Test
+    public void heightTest17() throws IOException, InterruptedException{
+        String testName = "heightTest17";
+        String diffPrefix = "diff17_";
+
+        HtmlConverter.convertToPdf(new File(sourceFolder + testName + ".html"), new File(destinationFolder + testName + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, diffPrefix));
+    }
+
     @Test
     public void heightWithCollapsingMarginsTest01() throws IOException, InterruptedException {
         String testName = "heightWithCollapsingMarginsTest01";
@@ -150,7 +240,6 @@ public void heightWithCollapsingMarginsTest03() throws IOException, InterruptedE
     }
 
     @Test
-    // TODO DEVSIX-1047
     public void heightWithCollapsingMarginsTest04() throws IOException, InterruptedException {
         String testName = "heightWithCollapsingMarginsTest04";
         String diffPrefix = "diffMargins04_";