Make columncount algorithm overidable

DEVSIX-7624

Author: guustysebie

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

@@ -30,12 +30,12 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.css.CssConstants;
 import com.itextpdf.layout.IPropertyContainer;
 import com.itextpdf.layout.element.AreaBreak;
-import com.itextpdf.layout.element.MulticolContainer;
 import com.itextpdf.layout.element.Div;
 import com.itextpdf.layout.element.IBlockElement;
 import com.itextpdf.layout.element.IElement;
 import com.itextpdf.layout.element.ILeafElement;
 import com.itextpdf.layout.element.Image;
+import com.itextpdf.layout.element.MulticolContainer;
 import com.itextpdf.styledxmlparser.node.IElementNode;
 
 import java.util.Map;
@@ -48,7 +48,7 @@ public class DivTagWorker implements ITagWorker, IDisplayAware {
     /**
      * Column container element.
      */
-    private MulticolContainer columnContainer;
+    protected MulticolContainer multicolContainer;
 
     /** The div element. */
     private Div div;
@@ -69,8 +69,8 @@ public DivTagWorker(IElementNode element, ProcessorContext context) {
         div = new Div();
         Map<String, String> styles = element.getStyles();
         if (styles != null && styles.containsKey(CssConstants.COLUMN_COUNT)) {
-            columnContainer = new MulticolContainer();
-            columnContainer.add(div);
+            multicolContainer = new MulticolContainer();
+            multicolContainer.add(div);
         }
         inlineHelper = new WaitingInlineElementsHelper(styles == null ? null : styles.get(CssConstants.WHITE_SPACE),
                 styles == null ? null : styles.get(CssConstants.TEXT_TRANSFORM));
@@ -142,7 +142,7 @@ public boolean processTagChild(ITagWorker childTagWorker, ProcessorContext conte
      */
     @Override
     public IPropertyContainer getElementResult() {
-        return columnContainer == null ? div : columnContainer;
+        return multicolContainer == null ? div : multicolContainer;
     }
 
     /* (non-Javadoc)

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

@@ -58,8 +58,10 @@ public class PTagWorker implements ITagWorker, IDisplayAware {
     /** The container which handles the elements that are present in the <p> tag. */
     private Div elementsContainer;
 
-    /** Container for the result in case of multicol layouting */
-    private MulticolContainer multicolContainer;
+    /**
+     * Container for the result in case of multicol layouting
+     */
+    protected MulticolContainer multicolContainer;
 
     /** Helper class for waiting inline elements. */
     private WaitingInlineElementsHelper inlineHelper;

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

@@ -45,16 +45,29 @@ This file is part of the iText (R) project.
  */
 public class TdTagWorker implements ITagWorker, IDisplayAware {
 
-    /** The cell. */
+    /**
+     * The cell.
+     */
     private final Cell cell;
 
-    /** Container for cell children in case of multicol layouting */
+    /**
+     * Container for cell children in case of multicol layouting
+     */
     private Div childOfMulticolContainer;
 
-    /** The inline helper. */
+    /**
+     * Container for children in case of multicol layouting
+     */
+    protected MulticolContainer multicolContainer;
+
+    /**
+     * The inline helper.
+     */
     private final WaitingInlineElementsHelper inlineHelper;
 
-    /** The display. */
+    /**
+     * The display.
+     */
     private final String display;
 
     /**
@@ -74,7 +87,7 @@ public TdTagWorker(IElementNode element, ProcessorContext context) {
 
         Map<String, String> styles = element.getStyles();
         if (styles.containsKey(CssConstants.COLUMN_COUNT)) {
-            MulticolContainer multicolContainer = new MulticolContainer();
+            multicolContainer = new MulticolContainer();
             childOfMulticolContainer = new Div();
             multicolContainer.add(childOfMulticolContainer);
             // TODO DEVSIX-7564, DEVSIX-7562 apply other multicol properties

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

@@ -49,7 +49,7 @@ public class UlOlTagWorker implements ITagWorker {
      */
     private List list;
 
-    private MulticolContainer multicolContainer;
+    protected MulticolContainer multicolContainer;
 
     /**
      * Helper class for waiting inline elements.