[RELEASE] iText pdfHTML 5.0.1

Author: iText-CI

pom.xml

@@ -5,15 +5,15 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>8.0.0</version>
+    <version>8.0.1</version>
     <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>5.0.0</version>
+  <version>5.0.1</version>
 
   <name>pdfHTML</name>
-  <description>pdfHTML is an iText 7 add-on that lets you to parse (X)HTML snippets and the associated CSS and converts
+  <description>pdfHTML is an iText add-on that lets you to parse (X)HTML snippets and the associated CSS and converts
     them to PDF.</description>
 
   <scm>

sharpenConfiguration.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<configuration>
+    <ignored>
+        <java>
+            <fileset reason="The Iterator pattern in Java is equivalent to IEnumerable in .NET, but we cannot map them on each other.">
+                <file path="com/itextpdf/html2pdf/css/resolve/CssContentElementNode.java"/>
+            </fileset>
+            <fileset reason="The ignore is added here because the work with absolute path and URI is not autoportable.">
+                <file path="com/itextpdf/html2pdf/resolver/resource/PathUtil.java"/>
+            </fileset>
+            <fileset reason="Added mto ignored because ExecutorService and usage of Futures are not autoportable">
+                <file path="com/itextpdf/html2pdf/HtmlConverterMultiThreadedTest.java"/>
+            </fileset>
+        </java>
+        <resource>
+            <file path="com/itextpdf/html2pdf/css/w3c/css21/text/text-transform-uppercase-002.pdf" />
+        </resource>
+    </ignored>
+</configuration>

src/main/java/com/itextpdf/html2pdf/ConverterProperties.java

@@ -100,6 +100,11 @@ public class ConverterProperties {
      */
     private IMetaInfo metaInfo;
 
+    /**
+     * enables continuous container for all elements.
+     */
+    private boolean continuousContainerEnabled;
+
     /**
      * Instantiates a new {@link ConverterProperties} instance.
      */
@@ -125,6 +130,7 @@ public ConverterProperties(ConverterProperties other) {
         this.metaInfo = other.metaInfo;
         this.limitOfLayouts = other.limitOfLayouts;
         this.immediateFlush = other.immediateFlush;
+        this.continuousContainerEnabled = other.continuousContainerEnabled;
     }
 
     /**
@@ -440,4 +446,24 @@ public ConverterProperties setEventMetaInfo(IMetaInfo metaInfo) {
         this.metaInfo = metaInfo;
         return this;
     }
+
+    /**
+     * check if continuous container is enabled.
+     *
+     * @return true if enabled, false otherwise
+     */
+    public boolean isContinuousContainerEnabled() {
+        return continuousContainerEnabled;
+    }
+
+    /**
+     * Sets continuous container support.
+     *
+     * @param value true to set continuous container, false otherwise
+     * @return the {@link ConverterProperties} instance
+     */
+    public ConverterProperties setContinuousContainerEnabled(boolean value) {
+        continuousContainerEnabled = value;
+        return this;
+    }
 }

src/main/java/com/itextpdf/html2pdf/actions/data/PdfHtmlProductData.java

@@ -30,7 +30,7 @@ This file is part of the iText (R) project.
  */
 public final class PdfHtmlProductData {
     private static final String PDF_HTML_PUBLIC_PRODUCT_NAME = "pdfHTML";
-    private static final String PDF_HTML_VERSION = "5.0.0";
+    private static final String PDF_HTML_VERSION = "5.0.1";
     private static final int PDF_HTML_COPYRIGHT_SINCE = 2000;
     private static final int PDF_HTML_COPYRIGHT_TO = 2023;
 

src/main/java/com/itextpdf/html2pdf/attach/ProcessorContext.java

@@ -143,6 +143,11 @@ public class ProcessorContext {
 
     private final int limitOfLayouts;
 
+    /**
+     * enables continuous container for all elements.
+     */
+    private boolean continuousContainerEnabled;
+
     /**
      * Instantiates a new {@link ProcessorContext} instance.
      *
@@ -195,6 +200,7 @@ public ProcessorContext(ConverterProperties converterProperties) {
         radioCheckResolver = new RadioCheckResolver();
         immediateFlush = converterProperties.isImmediateFlush();
         processingInlineSvg = false;
+        continuousContainerEnabled = converterProperties.isContinuousContainerEnabled();
     }
 
     /**
@@ -484,4 +490,14 @@ public void startProcessingInlineSvg() {
     public void endProcessingInlineSvg(){
         processingInlineSvg = false;
     }
+
+
+    /**
+     * check if continuous container is enabled.
+     *
+     * @return true if enabled, false otherwise
+     */
+    public boolean isContinuousContainerEnabled() {
+        return continuousContainerEnabled;
+    }
 }

src/main/java/com/itextpdf/html2pdf/attach/impl/DefaultHtmlProcessor.java

@@ -360,6 +360,11 @@ private void visit(INode node) {
                 } else if (tagWorker.getElementResult() != null) {
                     roots.add(tagWorker.getElementResult());
                 }
+
+                if (tagWorker.getElementResult() != null && context.isContinuousContainerEnabled()) {
+                    tagWorker.getElementResult().setProperty(Property.COLLAPSING_MARGINS, Boolean.FALSE);
+                    tagWorker.getElementResult().setProperty(Property.TREAT_AS_CONTINUOUS_CONTAINER, true);
+                }
             }
 
             element.setStyles(null);

src/main/java/com/itextpdf/html2pdf/attach/impl/DefaultTagWorkerFactory.java

@@ -26,8 +26,8 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.attach.ITagWorkerFactory;
 import com.itextpdf.html2pdf.attach.ProcessorContext;
 import com.itextpdf.html2pdf.attach.impl.DefaultTagWorkerMapping.ITagWorkerCreator;
-import com.itextpdf.html2pdf.util.TagProcessorMapping;
 import com.itextpdf.html2pdf.css.CssConstants;
+import com.itextpdf.html2pdf.util.TagProcessorMapping;
 import com.itextpdf.styledxmlparser.node.IElementNode;
 
 /**

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

@@ -35,6 +35,7 @@ This file is part of the iText (R) project.
 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;
@@ -44,6 +45,11 @@ This file is part of the iText (R) project.
  */
 public class DivTagWorker implements ITagWorker, IDisplayAware {
 
+    /**
+     * Column container element.
+     */
+    protected MulticolContainer multicolContainer;
+
     /** The div element. */
     private Div div;
 
@@ -62,6 +68,10 @@ 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) || styles.containsKey(CssConstants.COLUMN_WIDTH))) {
+            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));
         display = element.getStyles() != null ? element.getStyles().get(CssConstants.DISPLAY) : null;
@@ -132,7 +142,7 @@ public boolean processTagChild(ITagWorker childTagWorker, ProcessorContext conte
      */
     @Override
     public IPropertyContainer getElementResult() {
-        return div;
+        return multicolContainer == null ? div : multicolContainer;
     }
 
     /* (non-Javadoc)

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

@@ -95,7 +95,8 @@ public boolean processContent(String content, ProcessorContext context) {
             super.processContent(content, context);
         }
         if (!fakedContent) {
-            actualOptionTextContent.append(content); // TODO DEVSIX-1901: spaces are not collapsed according to white-space property in here
+            // TODO DEVSIX-2443: spaces are not collapsed according to white-space property in here
+            actualOptionTextContent.append(content);
         }
         return true;
     }

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

@@ -33,6 +33,7 @@ This file is part of the iText (R) project.
 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.layout.element.Paragraph;
 import com.itextpdf.styledxmlparser.node.IElementNode;
 
@@ -57,6 +58,11 @@ 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
+     */
+    protected MulticolContainer multicolContainer;
+
     /** Helper class for waiting inline elements. */
     private WaitingInlineElementsHelper inlineHelper;
 
@@ -71,6 +77,11 @@ public class PTagWorker implements ITagWorker, IDisplayAware {
      */
     public PTagWorker(IElementNode element, ProcessorContext context) {
         lastParagraph = new Paragraph();
+
+        if (element.getStyles().get(CssConstants.COLUMN_COUNT) != null || element.getStyles().get(CssConstants.COLUMN_WIDTH) != null) {
+            multicolContainer = new MulticolContainer();
+            multicolContainer.add(lastParagraph);
+        }
         inlineHelper = new WaitingInlineElementsHelper(element.getStyles().get(CssConstants.WHITE_SPACE),
                 element.getStyles().get(CssConstants.TEXT_TRANSFORM));
         display = element.getStyles() != null ? element.getStyles().get(CssConstants.DISPLAY) : null;
@@ -151,7 +162,10 @@ public boolean processTagChild(ITagWorker childTagWorker, ProcessorContext conte
      */
     @Override
     public IPropertyContainer getElementResult() {
-        return null == elementsContainer ? (IPropertyContainer) lastParagraph : (IPropertyContainer) elementsContainer;
+        if (multicolContainer == null) {
+            return null == elementsContainer ? (IPropertyContainer) lastParagraph : (IPropertyContainer) elementsContainer;
+        }
+        return multicolContainer;
     }
 
     @Override
@@ -163,6 +177,10 @@ private void processBlockElement(IElement propertyContainer) {
         if (elementsContainer == null) {
             elementsContainer = new Div();
             elementsContainer.add(lastParagraph);
+            if (multicolContainer != null) {
+                multicolContainer.getChildren().clear();
+                multicolContainer.add(elementsContainer);
+            }
         }
         inlineHelper.flushHangingLeaves(lastParagraph);
 

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

@@ -26,24 +26,35 @@ This file is part of the iText (R) project.
 import com.itextpdf.forms.form.element.AbstractSelectField;
 import com.itextpdf.forms.form.element.ComboBoxField;
 import com.itextpdf.forms.form.element.ListBoxField;
+import com.itextpdf.forms.form.element.SelectFieldItem;
 import com.itextpdf.html2pdf.attach.ITagWorker;
 import com.itextpdf.html2pdf.attach.ProcessorContext;
+import com.itextpdf.html2pdf.css.CssConstants;
+import com.itextpdf.html2pdf.html.AttributeConstants;
+import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
 import com.itextpdf.layout.IPropertyContainer;
 import com.itextpdf.layout.element.IBlockElement;
-import com.itextpdf.html2pdf.html.AttributeConstants;
-import com.itextpdf.html2pdf.css.CssConstants;
+import com.itextpdf.layout.properties.Property;
 import com.itextpdf.styledxmlparser.css.util.CssDimensionParsingUtils;
 import com.itextpdf.styledxmlparser.node.IElementNode;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * TagWorker class for the {@code select} element.
  */
 public class SelectTagWorker implements ITagWorker, IDisplayAware {
 
-    /** The form element. */
+    private static final Logger LOGGER = LoggerFactory.getLogger(SelectTagWorker.class);
+    /**
+     * The form element.
+     */
     private AbstractSelectField selectElement;
 
-    /** The display. */
+    /**
+     * The display.
+     */
     private String display;
 
     /**
@@ -61,6 +72,12 @@ public SelectTagWorker(IElementNode element, ProcessorContext context) {
 
         if (size > 1 || multipleAttr) {
             selectElement = new ListBoxField(name, size, multipleAttr);
+
+            // Remove some properties which are set in ListBoxField constructor
+            selectElement.deleteOwnProperty(Property.PADDING_LEFT);
+            selectElement.deleteOwnProperty(Property.PADDING_RIGHT);
+            selectElement.deleteOwnProperty(Property.PADDING_TOP);
+            selectElement.deleteOwnProperty(Property.PADDING_BOTTOM);
         } else {
             selectElement = new ComboBoxField(name);
         }
@@ -84,7 +101,16 @@ public boolean processContent(String content, ProcessorContext context) {
     public boolean processTagChild(ITagWorker childTagWorker, ProcessorContext context) {
         if (childTagWorker instanceof OptionTagWorker || childTagWorker instanceof OptGroupTagWorker) {
             if (childTagWorker.getElementResult() instanceof IBlockElement) {
-                selectElement.addOption((IBlockElement) childTagWorker.getElementResult());
+                IBlockElement blockElement = (IBlockElement) childTagWorker.getElementResult();
+                String label = blockElement.<String>getProperty(FormProperty.FORM_FIELD_LABEL);
+                SelectFieldItem item = new SelectFieldItem(label, blockElement);
+                selectElement.addOption(item);
+
+                Boolean isFlattenFromProperty = selectElement.<Boolean>getProperty(FormProperty.FORM_FIELD_FLATTEN);
+                if (childTagWorker instanceof OptGroupTagWorker && !Boolean.TRUE.equals(isFlattenFromProperty)) {
+                    LOGGER.warn(Html2PdfLogMessageConstant.OPTGROUP_NOT_SUPPORTED_IN_INTERACTIVE_SELECT);
+                }
+
                 return true;
             }
         }