Add column-gap and column-width support

DEVSIX-7553

Author: Dmitry Radchuk

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/DivTagWorker.java

@@ -68,7 +68,7 @@ public class DivTagWorker implements ITagWorker, IDisplayAware {
     public DivTagWorker(IElementNode element, ProcessorContext context) {
         div = new Div();
         Map<String, String> styles = element.getStyles();
-        if (styles != null && styles.containsKey(CssConstants.COLUMN_COUNT)) {
+        if (styles != null && (styles.containsKey(CssConstants.COLUMN_COUNT) || styles.containsKey(CssConstants.COLUMN_WIDTH))) {
             multicolContainer = new MulticolContainer();
             multicolContainer.add(div);
         }

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/PTagWorker.java

@@ -78,7 +78,7 @@ public class PTagWorker implements ITagWorker, IDisplayAware {
     public PTagWorker(IElementNode element, ProcessorContext context) {
         lastParagraph = new Paragraph();
 
-        if (element.getStyles().get(CssConstants.COLUMN_COUNT) != null ) {
+        if (element.getStyles().get(CssConstants.COLUMN_COUNT) != null || element.getStyles().get(CssConstants.COLUMN_WIDTH) != null) {
             multicolContainer = new MulticolContainer();
             multicolContainer.add(lastParagraph);
         }

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/TdTagWorker.java

@@ -86,7 +86,7 @@ public TdTagWorker(IElementNode element, ProcessorContext context) {
         cell.setPadding(0);
 
         Map<String, String> styles = element.getStyles();
-        if (styles.containsKey(CssConstants.COLUMN_COUNT)) {
+        if (styles.containsKey(CssConstants.COLUMN_COUNT) || styles.containsKey(CssConstants.COLUMN_WIDTH)) {
             multicolContainer = new MulticolContainer();
             childOfMulticolContainer = new Div();
             multicolContainer.add(childOfMulticolContainer);

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/UlOlTagWorker.java

@@ -65,7 +65,8 @@ public class UlOlTagWorker implements ITagWorker {
     public UlOlTagWorker(IElementNode element, ProcessorContext context) {
         list = new List().setListSymbol("");
 
-        if (element.getStyles().get(CssConstants.COLUMN_COUNT) != null ) {
+        if (element.getStyles().get(CssConstants.COLUMN_COUNT) != null
+                || element.getStyles().containsKey(CssConstants.COLUMN_WIDTH)) {
             multicolContainer = new MulticolContainer();
             multicolContainer.add(list);
         }

src/main/java/com/itextpdf/html2pdf/css/apply/impl/ColumnCssApplierUtil.java

@@ -26,9 +26,9 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.css.CssConstants;
 import com.itextpdf.layout.IPropertyContainer;
 import com.itextpdf.layout.properties.Property;
+import com.itextpdf.layout.properties.UnitValue;
 import com.itextpdf.styledxmlparser.css.CommonCssConstants;
 import com.itextpdf.styledxmlparser.css.util.CssDimensionParsingUtils;
-import com.itextpdf.styledxmlparser.css.util.CssTypesValidationUtils;
 
 import java.util.Map;
 
@@ -52,6 +52,29 @@ public static void applyColumnCount(Map<String, String> cssProps, ProcessorConte
             if (columnCount != null) {
                 element.setProperty(Property.COLUMN_COUNT, columnCount);
             }
+
+            final float emValue = CssDimensionParsingUtils.parseAbsoluteFontSize(cssProps.get(CssConstants.FONT_SIZE));
+            final float remValue = context.getCssContext().getRootFontSize();
+
+            UnitValue width = CssDimensionParsingUtils.parseLengthValueToPt(cssProps.get(CssConstants.COLUMN_WIDTH), emValue, remValue);
+            if (width != null) {
+                element.setProperty(Property.COLUMN_WIDTH,  width.getValue());
+            }
+
+            UnitValue gap = CssDimensionParsingUtils.parseLengthValueToPt(cssProps.get(CssConstants.COLUMN_GAP), emValue, remValue);
+            if (gap != null) {
+                element.setProperty(Property.COLUMN_GAP,  gap.getValue());
+            }
+
+            //Set default colum-gap to 1em
+            if (!element.hasProperty(Property.COLUMN_GAP)) {
+                element.setProperty(Property.COLUMN_GAP,  CssDimensionParsingUtils.parseRelativeValue("1em", emValue));
+            }
+            if (!element.hasProperty(Property.COLUMN_COUNT) && !element.hasProperty(Property.COLUMN_WIDTH)
+                    && (CommonCssConstants.AUTO.equals(cssProps.get(CssConstants.COLUMN_COUNT))
+                    || CommonCssConstants.AUTO.equals(cssProps.get(CssConstants.COLUMN_WIDTH)))) {
+                element.setProperty(Property.COLUMN_COUNT, 1);
+            }
         }
     }
 }

src/test/java/com/itextpdf/html2pdf/css/multicol/ColumnCountTest.java

@@ -269,7 +269,7 @@ public void basicOrphans2Test() throws IOException, InterruptedException {
     @Test
     @LogMessages(messages = {
             @LogMessage(messageTemplate = IoLogMessageConstant.WIDOWS_CONSTRAINT_VIOLATED, logLevel =
-                    LogLevelConstants.WARN, count = 2)
+                    LogLevelConstants.WARN)
     })
     public void basicWidows1Test() throws IOException, InterruptedException {
         runTest("basicWidows1Test");

src/test/java/com/itextpdf/html2pdf/css/multicol/ColumnGapTest.java

@@ -71,6 +71,7 @@ public void convertFloatColumnGapValueTest() throws IOException, InterruptedExce
         runTest("floatColumnGapValueTest");
     }
 
+    //TODO: DEVSIX-3596 add support of relative units that currently are not supported
     @Test
     @LogMessages(messages = @LogMessage(messageTemplate =
             Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))

src/test/java/com/itextpdf/html2pdf/css/multicol/ColumnWidthTest.java

@@ -24,6 +24,10 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
+import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
+import com.itextpdf.test.annotations.LogMessage;
+import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.IntegrationTest;
 
 import java.io.IOException;
@@ -51,6 +55,9 @@ public void convertColumnWidthAutoTest() throws IOException, InterruptedExceptio
         runTest("columnWidthAutoTest");
     }
 
+    //TODO: DEVSIX-3596 add support of relative units that currently are not supported
+    @LogMessages(messages =
+    @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
     @Test
     public void convertDifferentUnitsTest() throws IOException, InterruptedException {
         runTest("differentUnitsTest");
@@ -131,6 +138,7 @@ public void convertOverlaidFlexContentInColumnContainerTest() throws IOException
         runTest("overlaidFlexContentInColumnContainerTest");
     }
 
+    @LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
     @Test
     public void convertBasicFloatPropertyTest() throws IOException, InterruptedException {
         runTest("basicFloatPropertyTest");
@@ -221,16 +229,19 @@ public void diffElementsInsidePTest() throws IOException, InterruptedException {
         runTest("diffElementsInsidePTest");
     }
 
+    //TODO: DEVSIX-7630
     @Test
     public void tableColspanTest() throws IOException, InterruptedException {
         runTest("tableColspanTest");
     }
 
+    //TODO: DEVSIX-7630
     @Test
     public void tableRowspanTest() throws IOException, InterruptedException {
         runTest("tableRowspanTest");
     }
 
+    //TODO: DEVSIX-7630
     @Test
     public void tableColspanRowspanTest() throws IOException, InterruptedException {
         runTest("tableColspanRowspanTest");
@@ -261,6 +272,20 @@ public void basicBlockquoteTest() throws IOException, InterruptedException {
         runTest("basicBlockquoteTest");
     }
 
+
+    @LogMessages(messages =
+    @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 3))
+    @Test
+    public void invalidMulticolValuesTest() throws IOException, InterruptedException {
+        runTest("invalidMulticolValuesTest");
+    }
+
+    @Test
+    public void columnWidthPercentageTest() throws IOException, InterruptedException {
+        runTest("columnWidthPercentageTest");
+    }
+
+
     private void runTest(String testName) throws IOException, InterruptedException {
         convertToPdfAndCompare(testName,
                 SOURCE_FOLDER, DESTINATION_FOLDER, false,