[RELEASE] iText 7 pdfHTML - 3.0.3

https://github.com/itext/i7j-pdfhtml/releases/tag/3.0.3

* release/3.0.3:
  [RELEASE] pdfHTML 3.0.3
  Remove fixed todo
  Fix wrong todos number
  Add support to utf-8 image format in svg
  Update cmp
  Support word-break property
  Update cmp-s
  Update cmp-s after span wrapping support
  Fix test accroding to new log message in case of problems with data image
  Add test for  collaboration between radiobuttons and page-counter
  Update ToDo remarks
  Add missing copyright headers
  Add support of pages target-counter(s). Finalize whole target-counter logic
  Add missing copyright headers
  Implement non-page(s) target-counter(s) and fix counter bad perfomance
  Update cmp-s
  Support overflow-wrap
  Update CONTRIBUTING.md with latest information and links
  Divide the CssUtils class into several classes
  Remove "free" word from method name
  Get rid of using "LicenseKeyProductFeature" in ReflectionUtils class
  Add new test for descender/ascender calculations
  Add new test for absolute positioning
  Make mutable final sets unmodifable
  Add BatchConversionTest
  Add missing copyright headers
  Implement target-counter for page
  Link tests with the jira issue
  Fix body background size
  Add TODO references to the tests in  com.itextpdf.html2pdf.css.w3c.css_backgrounds.bg_size.vector
  Test cmp update and new test added
  Add supporting SvgCssContext and add minor improvements
  Add new tests illustrating problem of text-decoration-color effect on nested elements
  Add test to show that negative paddings processed incorrectly
  Remove package-info.java
  Update ToDo remark in CssOpacityTest#innerOpacityTest
  [AFTER RELEASE] pdfHTML 3.0.2
  Add some minor improvements to w3c tests

Author: iText-CI

CONTRIBUTING.md

@@ -68,8 +68,7 @@ Before you submit your pull request consider the following guidelines:
 * Verify that your proposed change hasn't already been addressed in the develop branch.
 * Don't send a separate pull request for every single file you change.  
 * Please sign the [iText Contributor License Agreement (iCLA)](#cla) before sending pull
-  requests for any change of more than 20 significant lines of code (we're not counting curly braces and other syntactical sugar).
-  We cannot accept code without this agreement.
+  requests. We cannot accept code without this agreement.
 * Fork the iText repository on GitHub.
 * Clone your iText fork to your local machine.
 * Make your changes, **including appropriate test cases**.
@@ -100,8 +99,7 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
 
 * We develop in Java first, and then port to .NET, so code submissions in Java are preferred.
   Nevertheless this shouldn't stop you from making a good pull request to the .NET port.
-* All Java code **must** be Java 7. Sorry, no lambda expressions or other Java 8 language features.
-* All features or bug fixes **must be tested** by one or more [unit tests][unit-testing].
+* All features or bug fixes **must be tested** by one or more unit tests.
 * All public API methods **must be documented** with JavaDoc. To see how we document our APIs, please check
   out the existing [javadocs][javadocs].
 * We follow the rules contained in
@@ -151,8 +149,7 @@ reference JIRA or GitHub issues that this commit **Closes**.
 
 ## <a name="cla">Signing the iCLA</a>
 
-Please sign the **iText Contributor License Agreement (iCLA)** before sending pull requests. For any larger code
-changes (more than 20 lines of significant code) to be accepted, the iCLA must be signed. It's a quick process, we promise!
+Please sign the [**iText Contributor License Agreement (iCLA)**][cla] before sending pull requests. For any code changes to be accepted, the iCLA must be signed. It's a quick process, we promise!
 
 We'll need you to [(digitally) sign and then email, fax or mail the form][cla].
 
@@ -165,18 +162,17 @@ We use the [Stack Exchange][stackoverflow] network for free support and [GitHub]
 * StackExchange: [http://stackexchange.com/legal](http://stackexchange.com/legal)
 * Github: [https://help.github.com/articles/github-terms-of-service/](https://help.github.com/articles/github-terms-of-service/)
 
-[cla]: http://itextpdf.com/policy
+[cla]: https://itextpdf.com/en/how-buy/legal/itext-contributor-license-agreement
 [coc]: CODE_OF_CONDUCT.md
-[github]: https://github.com/itext/itext7
-[java-style-guide]: http://www.oracle.com/technetwork/java/codeconvtoc-136057.html
-[javadocs]: http://itextpdf.com/api
-[pull]: https://github.com/itext/itext7/pulls
+[github]: https://github.com/itext/i7j-pdfhtml
+[java-style-guide]: https://www.oracle.com/technetwork/java/codeconvtoc-136057.html
+[javadocs]: https://itextpdf.com/api
+[pull]: https://github.com/itext/i7j-pdfhtml/pulls
 [sscce]: http://sscce.org/
-[stackoverflow]: http://stackoverflow.com/questions/tagged/itext7
-[good-questions]: http://stackoverflow.com/help/how-to-ask
-[mcve]: http://stackoverflow.com/help/mcve
-[support]: http://itextpdf.com/support
-[unit-testing]: http://junit.org/
+[stackoverflow]: https://stackoverflow.com/questions/tagged/itext7
+[good-questions]: https://stackoverflow.com/help/how-to-ask
+[mcve]: https://stackoverflow.com/help/mcve
+[support]: https://itextpdf.com/support
 [git-commit]: https://chris.beams.io/posts/git-commit/
 [git-commit-separate]: https://chris.beams.io/posts/git-commit/#separate
 [git-commit-limit-50]: https://chris.beams.io/posts/git-commit/#limit-50

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.1.13</version>
-    <relativePath/>
+    <version>7.1.14</version>
+    <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>3.0.2</version>
+  <version>3.0.3</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

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

@@ -56,6 +56,11 @@ This file is part of the iText (R) project.
  */
 public class ConverterProperties {
 
+    /**
+     * Default maximum number of layouts.
+     */
+    private static final int DEFAULT_LIMIT_OF_LAYOUTS = 10;
+
     /**
      * The media device description.
      */
@@ -103,11 +108,16 @@ public class ConverterProperties {
 
     /**
      * Indicates whether the document should be opened in immediate flush or not
-     **/
+     */
     private boolean immediateFlush = true;
 
     /**
-     * Meta info that will be added to the events thrown by html2Pdf
+     * Maximum number of layouts.
+     */
+    private int limitOfLayouts = DEFAULT_LIMIT_OF_LAYOUTS;
+
+    /**
+     * Meta info that will be added to the events thrown by html2Pdf.
      */
     private IMetaInfo metaInfo;
 
@@ -134,6 +144,7 @@ public ConverterProperties(ConverterProperties other) {
         this.outlineHandler = other.outlineHandler;
         this.charset = other.charset;
         this.metaInfo = other.metaInfo;
+        this.limitOfLayouts = other.limitOfLayouts;
     }
 
     /**
@@ -190,6 +201,26 @@ public ConverterProperties setFontProvider(FontProvider fontProvider) {
         return this;
     }
 
+    /**
+     * Gets maximum number of layouts.
+     *
+     * @return layouts limit
+     */
+    public int getLimitOfLayouts() {
+        return limitOfLayouts;
+    }
+
+    /**
+     * Sets maximum number of layouts.
+     *
+     * @param limitOfLayouts layouts limit
+     * @return the {@link ConverterProperties} instance
+     */
+    public ConverterProperties setLimitOfLayouts(int limitOfLayouts) {
+        this.limitOfLayouts = limitOfLayouts;
+        return this;
+    }
+
     /**
      * Gets the TagWorkerFactory instance.
      * <p>

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

@@ -50,8 +50,14 @@ public final class LogMessageConstant {
     /** The Constant ACROFORM_NOT_SUPPORTED_FOR_SELECT. */
     public static final String ACROFORM_NOT_SUPPORTED_FOR_SELECT = "AcroForm fields creation for select fields (ComboBoxField and ListBoxField) is not supported. They will be flattened instead.";
     public static final String ANCHOR_LINK_NOT_HANDLED = "The anchor link was not handled. Could not create a destination for element \"{0}\" with ID \"{1}\", which is processed by \"{2}\" tag worker class.";
+    /** The Constant CANNOT_RESOLVE_TARGET_COUNTER_VALUE. */
+    public static final String CANNOT_RESOLVE_TARGET_COUNTER_VALUE
+            = "Cannot resolve target-counter value with given target \"{0}\"";
     /** The Constant CONTENT_PROPERTY_INVALID. */
     public static final String CONTENT_PROPERTY_INVALID = "Content property \"{0}\" is either invalid or uses unsupported function.";
+    /** The Constant CUSTOM_RENDERER_IS_SET_FOR_HTML_DOCUMENT. */
+    public static final String CUSTOM_RENDERER_IS_SET_FOR_HTML_DOCUMENT = "A custom renderer which doesn't extend " +
+            "HtmlDocumentRenderer is set for HtmlDocument. Counters and target-counters may be displayed incorrectly.";
     /** The Constant CSS_PROPERTY_IN_PERCENTS_NOT_SUPPORTED. */
     public static final String CSS_PROPERTY_IN_PERCENTS_NOT_SUPPORTED = "Css property {0} in percents is not supported";
     public static final String DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN = "Default value of the css property \"{0}\" is unknown.";
@@ -65,6 +71,10 @@ public final class LogMessageConstant {
     public static final String ERROR_WHILE_LAYOUT_OF_FORM_FIELD = "Cannot layout form field field. It won't be displayed";
     /** The Constant ERROR_WHILE_LAYOUT_OF_FORM_FIELD_WITH_TYPE. */
     public static final String ERROR_WHILE_LAYOUT_OF_FORM_FIELD_WITH_TYPE = "Error during layout of form filed with type {0}.";
+    /** The Constant EXCEEDED_THE_MAXIMUM_NUMBER_OF_RELAYOUTS. */
+    public static final String EXCEEDED_THE_MAXIMUM_NUMBER_OF_RELAYOUTS = "Exceeded the maximum number of relayouts. " +
+            "The resultant document may look not as expected. " +
+            "Because of the content being dynamic iText performs several relayouts to produce correct document.";
     /** The Constant INPUT_FIELD_DOES_NOT_FIT. */
     public static final String INPUT_FIELD_DOES_NOT_FIT = "Input field doesn't fit in outer object. It will be clipped";
     /** The Constant INPUT_TYPE_IS_INVALID. */

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

@@ -160,6 +160,8 @@ public class ProcessorContext {
      */
     private boolean processingInlineSvg;
 
+    private final int limitOfLayouts;
+
     /**
      * Instantiates a new {@link ProcessorContext} instance.
      *
@@ -203,6 +205,7 @@ public ProcessorContext(ConverterProperties converterProperties) {
 
         resourceResolver = new HtmlResourceResolver(baseUri, this, converterProperties.getResourceRetriever());
 
+        limitOfLayouts = converterProperties.getLimitOfLayouts();
         cssContext = new CssContext();
         linkContext = new LinkContext();
 
@@ -214,6 +217,15 @@ public ProcessorContext(ConverterProperties converterProperties) {
         processingInlineSvg = false;
     }
 
+    /**
+     * Gets maximum number of layouts.
+     *
+     * @return layouts limit
+     */
+    public int getLimitOfLayouts() {
+        return limitOfLayouts;
+    }
+
     /**
      * Sets the font provider.
      *

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

@@ -47,6 +47,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.attach.IHtmlProcessor;
 import com.itextpdf.html2pdf.attach.ITagWorker;
 import com.itextpdf.html2pdf.attach.ProcessorContext;
+import com.itextpdf.html2pdf.attach.impl.layout.HtmlDocument;
 import com.itextpdf.html2pdf.attach.impl.layout.HtmlDocumentRenderer;
 import com.itextpdf.html2pdf.attach.impl.layout.RunningElementContainer;
 import com.itextpdf.html2pdf.attach.impl.layout.form.element.IPlaceholderable;
@@ -55,6 +56,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.attach.util.LinkHelper;
 import com.itextpdf.html2pdf.css.CssConstants;
 import com.itextpdf.html2pdf.css.apply.ICssApplier;
+import com.itextpdf.html2pdf.css.apply.util.CounterProcessorUtil;
 import com.itextpdf.html2pdf.css.apply.util.PageBreakApplierUtil;
 import com.itextpdf.html2pdf.css.resolve.DefaultCssResolver;
 import com.itextpdf.html2pdf.events.PdfHtmlEvent;
@@ -75,6 +77,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.font.Range;
 import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.property.RenderingMode;
+import com.itextpdf.layout.renderer.DocumentRenderer;
 import com.itextpdf.styledxmlparser.css.CssDeclaration;
 import com.itextpdf.styledxmlparser.css.font.CssFontFace;
 import com.itextpdf.styledxmlparser.css.CssFontFaceRule;
@@ -241,18 +244,59 @@ public Document processDocument(INode root, PdfDocument pdfDocument) {
         addFontFaceFonts();
         root = findHtmlNode(root);
 
+        if (context.getCssContext().isNonPagesTargetCounterPresent()) {
+            visitToProcessCounters(root);
+            context.getCssContext().getCounterManager().clearManager();
+        }
         visit(root);
-        Document doc = (Document) roots.get(0);
+        HtmlDocument doc = (HtmlDocument) roots.get(0);
         // TODO DEVSIX-4261 more precise check if a counter was actually added to the document
-        if (context.getCssContext().isPagesCounterPresent() && doc.getRenderer() instanceof HtmlDocumentRenderer) {
-            doc.relayout();
+        if (context.getCssContext().isPagesCounterPresent()) {
+            if (doc.getRenderer() instanceof HtmlDocumentRenderer) {
+                ((HtmlDocumentRenderer) doc.getRenderer()).processWaitingElement();
+                int counter = 0;
+                do {
+                    ++counter;
+                    doc.relayout();
+                    if (counter >= context.getLimitOfLayouts()) {
+                        logger.warn(
+                                MessageFormatUtil.format(LogMessageConstant.EXCEEDED_THE_MAXIMUM_NUMBER_OF_RELAYOUTS));
+                        break;
+                    }
+                } while (((DocumentRenderer) doc.getRenderer()).isRelayoutRequired());
+            } else {
+                logger.warn(LogMessageConstant.CUSTOM_RENDERER_IS_SET_FOR_HTML_DOCUMENT);
+            }
         }
         cssResolver = null;
         roots = null;
         EventCounterHandler.getInstance().onEvent(PdfHtmlEvent.CONVERT, context.getEventCountingMetaInfo(), getClass());
         return doc;
     }
 
+    /**
+     * Recursively processes a node to preprocess target-counters.
+     *
+     * @param node the node
+     */
+    private void visitToProcessCounters(INode node) {
+        if (node instanceof IElementNode) {
+            final IElementNode element = (IElementNode) node;
+            if (cssResolver instanceof DefaultCssResolver) {
+                ((DefaultCssResolver) cssResolver).resolveContentAndCountersStyles(node, context.getCssContext());
+            }
+            CounterProcessorUtil.startProcessingCounters(context.getCssContext(), element);
+            visitToProcessCounters(createPseudoElement(element, null, CssConstants.BEFORE));
+            for (final INode childNode : element.childNodes()) {
+                if (!context.isProcessingInlineSvg()) {
+                    visitToProcessCounters(childNode);
+                }
+            }
+            visitToProcessCounters(createPseudoElement(element, null, CssConstants.AFTER));
+            CounterProcessorUtil.endProcessingCounters(context.getCssContext(), element);
+        }
+    }
+
     /**
      * Recursively processes a node converting HTML into PDF using tag workers.
      *
@@ -284,23 +328,26 @@ private void visit(INode node) {
 
             context.getOutlineHandler().addOutlineAndDestToDocument(tagWorker, element, context);
 
-            visitPseudoElement(element, tagWorker, CssConstants.BEFORE);
-            visitPseudoElement(element, tagWorker, CssConstants.PLACEHOLDER);
+            CounterProcessorUtil.startProcessingCounters(context.getCssContext(), element);
+            visit(createPseudoElement(element, tagWorker, CssConstants.BEFORE));
+            visit(createPseudoElement(element, tagWorker, CssConstants.PLACEHOLDER));
             for (INode childNode : element.childNodes()) {
                 if (!context.isProcessingInlineSvg()) {
                     visit(childNode);
                 }
             }
-            visitPseudoElement(element, tagWorker, CssConstants.AFTER);
+            visit(createPseudoElement(element, tagWorker, CssConstants.AFTER));
+            CounterProcessorUtil.endProcessingCounters(context.getCssContext(), element);
 
             if (tagWorker != null) {
                 tagWorker.processEnd(element, context);
                 LinkHelper.createDestination(tagWorker, element, context);
                 context.getOutlineHandler().setDestinationToElement(tagWorker, element);
                 context.getState().pop();
 
-                if (!TagConstants.BODY.equals(element.name()) && !TagConstants.HTML.equals(element.name()))
+                if (!TagConstants.BODY.equals(element.name()) && !TagConstants.HTML.equals(element.name())) {
                     runApplier(element, tagWorker);
+                }
                 if (!context.getState().empty()) {
                     PageBreakApplierUtil.addPageBreakElementBefore(context, context.getState().top(), element, tagWorker);
                     tagWorker = processRunningElement(tagWorker, element, context);
@@ -445,31 +492,34 @@ private boolean createFont(String fontFamily, CssFontFace.CssFontFaceSrc src, Ra
     }
 
     /**
-     * Processes a pseudo element (before and after CSS).
+     * Creates a pseudo element (before and after CSS).
      *
      * @param node              the node
+     * @param tagWorker         the tagWorker
      * @param pseudoElementName the pseudo element name
+     * @return created pseudo element
      */
-    private void visitPseudoElement(IElementNode node, ITagWorker tagWorker, String pseudoElementName) {
+    private static CssPseudoElementNode createPseudoElement(IElementNode node,
+                                                            ITagWorker tagWorker, String pseudoElementName) {
         switch (pseudoElementName) {
             case CssConstants.BEFORE:
             case CssConstants.AFTER:
                 if (!CssPseudoElementUtil.hasBeforeAfterElements(node)) {
-                    return;
+                    return null;
                 }
                 break;
             case CssConstants.PLACEHOLDER:
                 if (!(TagConstants.INPUT.equals(node.name()) || TagConstants.TEXTAREA.equals(node.name())) || // TODO DEVSIX-1944: Resolve the issue and remove the line
                         null == tagWorker
                         || !(tagWorker.getElementResult() instanceof IPlaceholderable)
                         || null == ((IPlaceholderable) tagWorker.getElementResult()).getPlaceholder()) {
-                    return;
+                    return null;
                 }
                 break;
             default:
-                return;
+                return null;
         }
-        visit(new CssPseudoElementNode(node, pseudoElementName));
+        return new CssPseudoElementNode(node, pseudoElementName);
     }
 
     /**

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/DimensionContainer.java

@@ -43,10 +43,9 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.attach.impl.layout;
 
 import com.itextpdf.html2pdf.css.CssConstants;
-import com.itextpdf.html2pdf.css.apply.util.FontStyleApplierUtil;
 import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.styledxmlparser.css.CssContextNode;
-import com.itextpdf.styledxmlparser.css.util.CssUtils;
+import com.itextpdf.styledxmlparser.css.util.CssDimensionParsingUtils;
 
 /**
  * Container class for grouping necessary values used in dimension calculation
@@ -73,8 +72,8 @@ boolean isAutoDimension() {
     }
 
     float parseDimension(CssContextNode node, String content, float maxAvailableDimension, float additionalWidthFix) {
-        float fontSize = CssUtils.parseAbsoluteFontSize(node.getStyles().get(CssConstants.FONT_SIZE));
-        UnitValue unitValue = CssUtils.parseLengthValueToPt(content, fontSize, 0);
+        float fontSize = CssDimensionParsingUtils.parseAbsoluteFontSize(node.getStyles().get(CssConstants.FONT_SIZE));
+        UnitValue unitValue = CssDimensionParsingUtils.parseLengthValueToPt(content, fontSize, 0);
         if (unitValue == null) {
             return 0;
         }