[RELEASE] iText 7 pdfHTML - 2.1.3

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

* release/2.1.3:
  [RELEASE] 2.1.3-SNAPSHOT -> 2.1.3
  Update cmp-files for closepath linejoin
  Do not reset the alignment for RTL elements if it's present.
  Fix anchor links handling with destinations on elements handled by SpanTagWorker
  Set correct scm links
  Set correct packages group for javadoc plugin
  Remove pom entries that are duplicated from the parent pom
  Update cmps related to bold style detection.
  Default input tags with invalid types.
  Improve processing of block elements / images inside of a paragraph.
  Add some new tests for the table's fixed-layout algorithm in case of a negative width remained.
  Improve contribution guidelines
  Restore page counter renderer's text after it has been layouted.
  Update cmp file for rgba opacity test
  Remove unused imports and add @category for tests
  Use whitespace-related utility methods from SXP to avoid duplication
  Fix javadoc errors
  Upgrade Surefire and Failsafe
  Change tests to avoid external resources dependencies
  Handle inline blocks with display: block style
  Update cmp-s
  [RELEASE] 2.1.2-SNAPSHOT -> 2.1.3-SNAPSHOT
  Do not create a new FontProvider instance on ProcessorContext#reset. Reset the existed one instead.

Author: iText-CI

CONTRIBUTING.md

@@ -70,83 +70,29 @@ Before you submit your pull request consider the following guidelines:
 * 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.
-* Clone **iText 7 Community** to your local machine.
-
-     ```shell
-     git clone git@github.com:itext/itext7.git
-     cd itext7
-     git fetch origin
-     git checkout -b develop origin/develop
-     ```
-
-* Make your changes in a new git branch based off the develop branch:
-
-     ```shell
-     git checkout -b my-fix-branch develop
-     ```
-
-* Create your patch, **including appropriate test cases**.
+* Fork the iText repository on GitHub.
+* Clone your iText fork to your local machine.
+* Make your changes, **including appropriate test cases**.
 * Follow our [Coding Rules](#rules).
-* Run the full **iText 7 Community** test suite and ensure that all tests pass.
 * Commit your changes using a descriptive commit message that follows our
   [commit message conventions](#commit-message-format).
-
-     ```shell
-     git commit -a
-     ```
-  Note: the optional commit `-a` command line option will automatically `add` and `rm` edited files.
-
 * Now would be a good time to fix up your commits (if you want or need to) with `git rebase --interactive`.
 * Build your changes locally to ensure all the tests pass.
-* Push your branch to your GitHub account:
-
-    ```shell
-    git remote add my-remote git@github.com:my-remote/itext7.git
-    git push my-remote my-fix-branch
-    ```
-
-* In GitHub, send a pull request to `itext7:develop`.
+* Push your changes to your GitHub account.
+* Create a pull request in GitHub.
+"Head fork" should be your repository, and the "base fork" should be the iText7 official repository.
 * If we suggest changes then:
   * Make the required updates.
-  * Re-run the **iText 7 Community** test suite to ensure tests are still passing.
-  * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
-
-    ```shell
-    git fetch origin
-    git rebase develop -i
-    git push my-remote my-fix-branch -f
-    ```
+  * Fix up your commits if needed, with an interactive rebase.
+  * Re-run the tests and make sure that they are still passing.
+  * Force push to your GitHub repository. This will update your Pull Request.
 
 That's it! Thank you for your contribution!
 
 #### After your pull request is merged
 
-After your pull request is merged, you can safely delete your branch and pull the changes
-from the main (upstream) repository:
-
-* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
-
-    ```shell
-    git push my-remote --delete my-fix-branch
-    ```
-
-* Check out the develop branch:
-
-    ```shell
-    git checkout develop -f
-    ```
-
-* Delete the local branch:
-
-    ```shell
-    git branch -D my-fix-branch
-    ```
-
-* Update your develop with the latest upstream version:
-
-    ```shell
-    git pull --ff upstream develop
-    ```
+After your pull request is merged, you can safely delete your fork and pull the changes
+from the main (upstream) repository.
 
 
 ## <a name="rules">Coding Rules</a>

pom.xml

@@ -4,18 +4,20 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.1.5</version>
+    <version>7.1.6</version>
     <relativePath/>
   </parent>
   <artifactId>html2pdf</artifactId>
-  <version>2.1.2</version>
+  <version>2.1.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
     them to PDF.</description>
-  <url>http://itextpdf.com/</url>
+  <scm>
+    <connection>scm:git:ssh://git@git.itextsupport.com:7999/i7j/html2pdf.git</connection>
+    <url>https://git.itextsupport.com/projects/I7J/repos/html2pdf</url>
+  </scm>
   <properties>
     <itext.version>${project.parent.version}</itext.version>
-    <javadoc.version>3.0.0</javadoc.version>
   </properties>
   <repositories>
     <repository>
@@ -95,7 +97,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>${failsafe.version}</version>
         <configuration>
           <includes>
             <include>**/*Test.java</include>
@@ -107,37 +109,20 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${javadoc.version}</version>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
-          <quiet>true</quiet>
-          <failOnError>true</failOnError>
+          <subpackages>com.itextpdf.html2pdf</subpackages>
+          <groups>
+            <group>
+              <title>pdfHTML</title>
+              <packages>com.itextpdf.html2pdf*</packages>
+            </group>
+          </groups>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>3.0.1</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>${surefire.version}</version>
         <configuration>
           <groups>${unittests}</groups>
         </configuration>

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

@@ -45,7 +45,6 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.attach.ITagWorkerFactory;
 import com.itextpdf.html2pdf.attach.impl.OutlineHandler;
-import com.itextpdf.html2pdf.css.CssConstants;
 import com.itextpdf.html2pdf.css.apply.ICssApplierFactory;
 import com.itextpdf.kernel.counter.event.IMetaInfo;
 import com.itextpdf.layout.font.FontProvider;

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

@@ -66,7 +66,6 @@ This file is part of the iText (R) project.
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.file.Paths;
 import java.util.List;
 
 /**

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

@@ -49,6 +49,7 @@ 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 CONTENT_PROPERTY_INVALID. */
     public static final String CONTENT_PROPERTY_INVALID = "Content property \"{0}\" is either invalid or uses unsupported function.";
     /** The Constant CSS_PROPERTY_IN_PERCENTS_NOT_SUPPORTED. */
@@ -72,6 +73,8 @@ public final class LogMessageConstant {
     /** The Constant INPUT_SUPPORTS_ONLY_POINT_WIDTH. */
     @Deprecated
     public static final String INPUT_SUPPORTS_ONLY_POINT_WIDTH = "Input field supports only point width";
+    /** The Constant INPUT_TYPE_IS_INVALID. */
+    public static final String INPUT_TYPE_IS_INVALID = "Input type {0} is invalid. The default text type will be used instead.";
     /** The Constant INPUT_TYPE_IS_NOT_SUPPORTED. */
     public static final String INPUT_TYPE_IS_NOT_SUPPORTED = "Input type {0} is not supported";
     /** The Constant INVALID_CSS_PROPERTY_DECLARATION. */
@@ -109,7 +112,7 @@ public final class LogMessageConstant {
     public static final String TEXT_WAS_NOT_PROCESSED = "Text was not processed: {0}";
     /** The Constant UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE. */
     public static final String UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE = "Unable to process external css file";
-    /** The Constant UNABLE_TO_PROCESS_IMAGE_AS_SVG*/
+    /** The Constant UNABLE_TO_PROCESS_IMAGE_AS_SVG */
     public static final String UNABLE_TO_PROCESS_IMAGE_AS_SVG = "Unable to process image found at {0} as an SVG";
     /** The Constant UNABLE_TO_RESOLVE_COUNTER. */
     public static final String UNABLE_TO_RESOLVE_COUNTER = "Unable to resolve counter \"{0}\"";

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

@@ -61,7 +61,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.font.FontSet;
 import com.itextpdf.layout.font.Range;
 import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
-import com.itextpdf.styledxmlparser.resolver.font.BasicFontProvider;
 import com.itextpdf.styledxmlparser.resolver.resource.ResourceResolver;
 
 /**
@@ -416,7 +415,7 @@ public void reset() {
         this.linkContext = new LinkContext();
         this.formFieldNameResolver.reset();
         //Reset font provider. PdfFonts shall be reseted.
-        this.fontProvider = new BasicFontProvider(this.fontProvider.getFontSet(), this.fontProvider.getDefaultFontFamily());
+        this.fontProvider.reset();
         this.tempFonts = null;
         this.outlineHandler.reset();
         this.processingInlineSvg = false;

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

@@ -43,6 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.attach.impl;
 
 import com.itextpdf.html2pdf.html.AttributeConstants;
+import com.itextpdf.html2pdf.html.TagConstants;
 import com.itextpdf.styledxmlparser.node.IElementNode;
 import com.itextpdf.styledxmlparser.node.INode;
 
@@ -91,9 +92,12 @@ public LinkContext scanForIds(INode root) {
         while (!stk.isEmpty()) {
             INode n = stk.pop();
             if (n instanceof IElementNode) {
-                IElementNode n2 = (IElementNode) n;
-                if (n2.name().equals(AttributeConstants.a) && n2.getAttribute(AttributeConstants.HREF) != null && n2.getAttribute(AttributeConstants.HREF).startsWith("#")) {
-                    linkDestinations.add(n2.getAttribute(AttributeConstants.HREF).substring(1));
+                IElementNode elem = (IElementNode) n;
+                if (TagConstants.A.equals(elem.name())) {
+                    String href = elem.getAttribute(AttributeConstants.HREF);
+                    if (href != null && href.startsWith("#")){
+                        linkDestinations.add(href.substring(1));
+                    }
                 }
             }
             if (!n.childNodes().isEmpty()) {

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

@@ -60,9 +60,6 @@ This file is part of the iText (R) project.
  */
 public class BodyHtmlStylesContainer implements IPropertyContainer {
 
-    /**
-     * {@inheritDoc}
-     */
     protected Map<Integer, Object> properties = new HashMap<>();
 
     /**

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

@@ -47,7 +47,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.layout.LayoutArea;
 import com.itextpdf.layout.layout.LayoutContext;
 import com.itextpdf.layout.layout.LayoutResult;
-import com.itextpdf.layout.minmaxwidth.MinMaxWidthUtils;
 import com.itextpdf.layout.renderer.IRenderer;
 import com.itextpdf.styledxmlparser.css.CssContextNode;
 

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

@@ -74,20 +74,33 @@ class PageCountRenderer extends TextRenderer {
     @Override
     public LayoutResult layout(LayoutContext layoutContext) {
         PageCountType pageCountType = (PageCountType)this.<PageCountType>getProperty(Html2PdfProperty.PAGE_COUNT_TYPE);
+        String previousText = getText().toString();
+        // If typography is enabled and the page counter element has a non-default direction,
+        // iText processes its content (see LineRenderer#updateBidiLevels) before layouting it.
+        // This might result in an ArrayIndexOutOfBounds exception, because currently iText updates the page counter's content on layout.
+        // To solve this, this workaround has been implemented: the renderer's strToBeConverted shouldn't be updated by layout.
+        boolean textHasBeenReplaced = false;
         if (pageCountType == PageCountType.CURRENT_PAGE_NUMBER) {
             setText(String.valueOf(layoutContext.getArea().getPageNumber()));
+            textHasBeenReplaced = true;
         } else if (pageCountType == PageCountType.TOTAL_PAGE_COUNT) {
             IRenderer rootRenderer = this;
             while (rootRenderer instanceof AbstractRenderer && ((AbstractRenderer) rootRenderer).getParent() != null) {
                 rootRenderer = ((AbstractRenderer) rootRenderer).getParent();
             }
             if (rootRenderer instanceof HtmlDocumentRenderer && ((HtmlDocumentRenderer) rootRenderer).getEstimatedNumberOfPages() > 0) {
                 setText(String.valueOf(((HtmlDocumentRenderer) rootRenderer).getEstimatedNumberOfPages()));
+                textHasBeenReplaced = true;
             } else if (rootRenderer instanceof DocumentRenderer && rootRenderer.getModelElement() instanceof Document) {
                 setText(String.valueOf(((Document) rootRenderer.getModelElement()).getPdfDocument().getNumberOfPages()));
+                textHasBeenReplaced = true;
             }
         }
-        return super.layout(layoutContext);
+        LayoutResult result = super.layout(layoutContext);
+        if (textHasBeenReplaced) {
+            setText(previousText);
+        }
+        return result;
     }
 
     /* (non-Javadoc)