Merge branch '7.1' into develop

# Conflicts:
#	pom.xml
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest08.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest09.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest10.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest11.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest12.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest13.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest14.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest15.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest16.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/HeightTest/cmp_heightTest17.pdf
#	src/test/resources/com/itextpdf/html2pdf/element/TtTest/cmp_TtTest01.pdf

Author: IdamkinI

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.0.6-SNAPSHOT</version>
+    <version>7.1.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</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
@@ -214,6 +214,60 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>3.2.0</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <unpackBundle>true</unpackBundle>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.github.ekryd.sortpom</groupId>
+        <artifactId>sortpom-maven-plugin</artifactId>
+        <version>2.4.0</version>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>sort</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <lineSeparator>\n</lineSeparator>
+          <encoding>${project.build.sourceEncoding}</encoding>
+          <sortProperties>true</sortProperties>
+          <keepBlankLines>true</keepBlankLines>
+          <expandEmptyElements>false</expandEmptyElements>
+          <nrOfIndentSpace>2</nrOfIndentSpace>
+          <sortDependencies>scope</sortDependencies>
+          <skip>${skipSortPom}</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tidy-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>pom</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

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

@@ -151,6 +151,8 @@ public final class LogMessageConstant {
     /** The Constant UNKNOWN_MARGIN_BOX_CHILD. */
     public static final String UNKNOWN_MARGIN_BOX_CHILD = "Unknown margin box child";
 
+    public static final String UNSUPPORTED_PSEUDO_CSS_SELECTOR = "Unsupported pseudo css selector: {0}";
+
     public static final String URL_IS_NOT_CLOSED_IN_CSS_EXPRESSION = "url function is not properly closed in expression:{0}";
 
     public static final String URL_IS_EMPTY_IN_CSS_EXPRESSION = "url function is empty in expression:{0}";

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

@@ -2,15 +2,15 @@
     This file is part of the iText (R) project.
     Copyright (c) 1998-2017 iText Group NV
     Authors: Bruno Lowagie, Paulo Soares, et al.
-    
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License version 3
     as published by the Free Software Foundation with the addition of the
     following permission added to Section 15 as permitted in Section 7(a):
     FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
     ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
     OF THIRD PARTY RIGHTS
-    
+
     This program is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
     or FITNESS FOR A PARTICULAR PURPOSE.
@@ -20,23 +20,23 @@ This file is part of the iText (R) project.
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA, 02110-1301 USA, or download the license from the following URL:
     http://itextpdf.com/terms-of-use/
-    
+
     The interactive user interfaces in modified source and object code versions
     of this program must display Appropriate Legal Notices, as required under
     Section 5 of the GNU Affero General Public License.
-    
+
     In accordance with Section 7(b) of the GNU Affero General Public License,
     a covered work must retain the producer line in every PDF that is created
     or manipulated using iText.
-    
+
     You can be released from the requirements of the license by purchasing
     a commercial license. Buying such a license is mandatory as soon as you
     develop commercial activities involving the iText software without
     disclosing the source code of your own applications.
     These activities include: offering paid services to customers as an ASP,
     serving PDFs on the fly in a web application, shipping iText with a closed
     source product.
-    
+
     For more information, please contact iText Software Corp. at this
     address: sales@itextpdf.com
  */
@@ -61,13 +61,13 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.html.node.ITextNode;
 import com.itextpdf.kernel.geom.PageSize;
 import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfName;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.canvas.CanvasArtifact;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
+import com.itextpdf.kernel.pdf.tagging.StandardRoles;
 import com.itextpdf.layout.Canvas;
 import com.itextpdf.layout.IPropertyContainer;
-import com.itextpdf.layout.border.Border;
+import com.itextpdf.layout.borders.Border;
 import com.itextpdf.layout.element.Div;
 import com.itextpdf.layout.element.IBlockElement;
 import com.itextpdf.layout.element.IElement;
@@ -80,8 +80,8 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.renderer.DocumentRenderer;
 import com.itextpdf.layout.renderer.DrawContext;
 import com.itextpdf.layout.renderer.IRenderer;
-import org.jsoup.nodes.Element;
-import org.jsoup.parser.Tag;
+import com.itextpdf.html2pdf.jsoup.nodes.Element;
+import com.itextpdf.html2pdf.jsoup.parser.Tag;
 import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
@@ -517,7 +517,7 @@ private void createMarginBoxesElements(List<PageMarginBoxContextNode> resolvedPa
                     }
                 }
             }
-            marginBox.setRole(PdfName.Artifact);
+            marginBox.getAccessibilityProperties().setRole(StandardRoles.ARTIFACT);
         }
     }
 
@@ -534,7 +534,7 @@ private Rectangle[] calculateMarginBoxRectangles(List<PageMarginBoxContextNode>
         float rightMargin = margins[1];
         float bottomMargin = margins[2];
         float leftMargin = margins[3];
-        Rectangle withoutMargins = pageSize.clone().<Rectangle>applyMargins(topMargin, rightMargin, bottomMargin, leftMargin, false);
+        Rectangle withoutMargins = pageSize.clone().applyMargins(topMargin, rightMargin, bottomMargin, leftMargin, false);
         float topBottomMarginWidth = withoutMargins.getWidth() / 3;
         float leftRightMarginHeight = withoutMargins.getHeight() / 3;
         Rectangle[] hardcodedBoxRectangles = new Rectangle[] {
@@ -572,7 +572,7 @@ private Rectangle calculateContainingBlockSizesForMarginBox(int marginBoxInd) {
         if (marginBoxInd == 0 || marginBoxInd == 4 || marginBoxInd == 8 || marginBoxInd == 12) {
             return marginBoxRectangles[marginBoxInd];
         }
-        Rectangle withoutMargins = pageSize.clone().<Rectangle>applyMargins(margins[0], margins[1], margins[2], margins[3], false);
+        Rectangle withoutMargins = pageSize.clone().applyMargins(margins[0], margins[1], margins[2], margins[3], false);
         if (marginBoxInd < 4) {
             return new Rectangle(withoutMargins.getWidth(), margins[0]);
         } else if (marginBoxInd < 8) {

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

@@ -84,7 +84,7 @@ class PageSizeParser {
      * @return the page size
      */
     static PageSize fetchPageSize(String pageSizeStr, float em, float rem, PageSize defaultPageSize) {
-        PageSize pageSize = defaultPageSize.clone();
+        PageSize pageSize = (PageSize) defaultPageSize.clone();
         if (pageSizeStr == null || CssConstants.AUTO.equals(pageSizeStr)) {
             return pageSize;
         }

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/AbstractFormFieldRenderer.java

@@ -51,6 +51,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.layout.LayoutResult;
 import com.itextpdf.layout.layout.MinMaxWidthLayoutResult;
 import com.itextpdf.layout.minmaxwidth.MinMaxWidth;
+import com.itextpdf.layout.minmaxwidth.MinMaxWidthUtils;
 import com.itextpdf.layout.property.FloatPropertyValue;
 import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.property.UnitValue;
@@ -134,9 +135,9 @@ public void drawChildren(DrawContext drawContext) {
      * @see com.itextpdf.layout.renderer.BlockRenderer#getMinMaxWidth(float)
      */
     @Override
-    protected MinMaxWidth getMinMaxWidth(float availableWidth) {
-        MinMaxWidthLayoutResult result = (MinMaxWidthLayoutResult) layout(new LayoutContext(new LayoutArea(1, new Rectangle(availableWidth, AbstractRenderer.INF))), true);
-        return result.getNotNullMinMaxWidth(availableWidth);
+    protected MinMaxWidth getMinMaxWidth() {
+        MinMaxWidthLayoutResult result = (MinMaxWidthLayoutResult) layout(new LayoutContext(new LayoutArea(1, new Rectangle(MinMaxWidthUtils.getInfWidth(), AbstractRenderer.INF))), true);
+        return result.getMinMaxWidth();
     }
 
     /**
@@ -251,7 +252,7 @@ private LayoutResult layout(LayoutContext layoutContext, boolean minMaxWidth) {
                 occupiedArea.setBBox(flatRenderer.getOccupiedArea().getBBox().clone());
             }
 
-            return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this).setMinMaxWidth(new MinMaxWidth(0, parentWidth));
+            return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this).setMinMaxWidth(new MinMaxWidth());
         }
         if (!childRenderers.isEmpty()) {
             flatRenderer = childRenderers.get(0);
@@ -271,15 +272,15 @@ private LayoutResult layout(LayoutContext layoutContext, boolean minMaxWidth) {
             if (!minMaxWidth) {
                 setProperty(Property.FORCED_PLACEMENT, true);
                 occupiedArea.getBBox().setWidth(0).setHeight(0);
-                return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this).setMinMaxWidth(new MinMaxWidth(0, parentWidth));
+                return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this).setMinMaxWidth(new MinMaxWidth());
             } else {
-                return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this).setMinMaxWidth(new MinMaxWidth(occupiedArea.getBBox().getWidth(), occupiedArea.getBBox().getWidth()));
+                return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this).setMinMaxWidth(new MinMaxWidth(occupiedArea.getBBox().getWidth(), occupiedArea.getBBox().getWidth(), 0));
             }
         }
         if (result.getStatus() != LayoutResult.FULL || !isRendererFit(parentWidth, parentHeight)) {
             LoggerFactory.getLogger(getClass()).warn(LogMessageConstant.INPUT_FIELD_DOES_NOT_FIT);
         }
         return new MinMaxWidthLayoutResult(LayoutResult.FULL, occupiedArea, this, null)
-                .setMinMaxWidth(new MinMaxWidth(0, parentWidth, occupiedArea.getBBox().getWidth(), occupiedArea.getBBox().getWidth()));
+                .setMinMaxWidth(new MinMaxWidth(occupiedArea.getBBox().getWidth(), occupiedArea.getBBox().getWidth(), 0));
     }
 }

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/ButtonRenderer.java

@@ -54,10 +54,13 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.layout.property.Background;
 import com.itextpdf.layout.property.Property;
+import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.layout.renderer.DrawContext;
 import com.itextpdf.layout.renderer.IRenderer;
 import com.itextpdf.layout.renderer.LineRenderer;
+import com.itextpdf.layout.renderer.ListItemRenderer;
 import com.itextpdf.layout.renderer.ParagraphRenderer;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
@@ -129,12 +132,16 @@ protected IRenderer createFlatRenderer() {
     protected void applyAcroField(DrawContext drawContext) {
         String value = getDefaultValue();
         String name = getModelId();
-        float fontSize = (float) this.getPropertyAsFloat(Property.FONT_SIZE);
+        UnitValue fontSize = (UnitValue) this.getPropertyAsUnitValue(Property.FONT_SIZE);
+        if (!fontSize.isPointValue()) {
+            Logger logger = LoggerFactory.getLogger(ButtonRenderer.class);
+            logger.error(MessageFormatUtil.format(com.itextpdf.io.LogMessageConstant.PROPERTY_IN_PERCENTS_NOT_SUPPORTED, Property.FONT_SIZE));
+        }
         PdfDocument doc = drawContext.getDocument();
         Rectangle area = flatRenderer.getOccupiedArea().getBBox().clone();
         applyPaddings(area, true);
         PdfPage page = doc.getPage(occupiedArea.getPageNumber());
-        PdfButtonFormField button = PdfFormField.createPushButton(doc, area, name, value, font, fontSize);
+        PdfButtonFormField button = PdfFormField.createPushButton(doc, area, name, value, font, fontSize.getValue());
         Background background = this.<Background>getProperty(Property.BACKGROUND);
         if (background != null && background.getColor() != null) {
             button.setBackgroundColor(background.getColor());

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/InputFieldRenderer.java

@@ -53,10 +53,13 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfString;
 import com.itextpdf.layout.property.Property;
+import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.layout.renderer.DrawContext;
 import com.itextpdf.layout.renderer.IRenderer;
 import com.itextpdf.layout.renderer.LineRenderer;
+import com.itextpdf.layout.renderer.ListItemRenderer;
 import com.itextpdf.layout.renderer.ParagraphRenderer;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
@@ -144,15 +147,19 @@ protected void applyAcroField(DrawContext drawContext) {
         font.setSubset(false);
         String value = getDefaultValue();
         String name = getModelId();
-        float fontSize = (float) this.getPropertyAsFloat(Property.FONT_SIZE);
+        UnitValue fontSize = (UnitValue) this.getPropertyAsUnitValue(Property.FONT_SIZE);
+        if (!fontSize.isPointValue()) {
+            Logger logger = LoggerFactory.getLogger(InputFieldRenderer.class);
+            logger.error(MessageFormatUtil.format(com.itextpdf.io.LogMessageConstant.PROPERTY_IN_PERCENTS_NOT_SUPPORTED, Property.FONT_SIZE));
+        }
         PdfDocument doc = drawContext.getDocument();
         Rectangle area = flatRenderer.getOccupiedArea().getBBox().clone();
         PdfPage page = doc.getPage(occupiedArea.getPageNumber());
         boolean password = isPassword();
         if (password) {
             value = "";
         }
-        PdfFormField inputField = PdfFormField.createText(doc, area, name, value, font, fontSize);
+        PdfFormField inputField = PdfFormField.createText(doc, area, name, value, font, fontSize.getValue());
         if (password) {
             inputField.setFieldFlag(PdfFormField.FF_PASSWORD, true);
         } else {
@@ -169,9 +176,13 @@ protected void applyAcroField(DrawContext drawContext) {
     protected Float getContentWidth() {
         Float width = super.getContentWidth();
         if (width == null) {
-            float fontSize = (float) this.getPropertyAsFloat(Property.FONT_SIZE);
+            UnitValue fontSize = (UnitValue) this.getPropertyAsUnitValue(Property.FONT_SIZE);
+            if (!fontSize.isPointValue()) {
+                Logger logger = LoggerFactory.getLogger(InputFieldRenderer.class);
+                logger.error(MessageFormatUtil.format(com.itextpdf.io.LogMessageConstant.PROPERTY_IN_PERCENTS_NOT_SUPPORTED, Property.FONT_SIZE));
+            }
             int size = getSize();
-            return fontSize * (size * 0.5f + 2) + 2;
+            return fontSize.getValue() * (size * 0.5f + 2) + 2;
         }
         return width;
     }

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/TextAreaRenderer.java

@@ -53,10 +53,12 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfString;
 import com.itextpdf.layout.property.Property;
+import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.layout.renderer.DrawContext;
 import com.itextpdf.layout.renderer.IRenderer;
 import com.itextpdf.layout.renderer.LineRenderer;
 import com.itextpdf.layout.renderer.ParagraphRenderer;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
@@ -160,11 +162,15 @@ protected void applyAcroField(DrawContext drawContext) {
         font.setSubset(false);
         String value = getDefaultValue();
         String name = getModelId();
-        float fontSize = (float) this.getPropertyAsFloat(Property.FONT_SIZE);
+        UnitValue fontSize = (UnitValue) this.getPropertyAsUnitValue(Property.FONT_SIZE);
+        if (!fontSize.isPointValue()) {
+            Logger logger = LoggerFactory.getLogger(TextAreaRenderer.class);
+            logger.error(MessageFormatUtil.format(com.itextpdf.io.LogMessageConstant.PROPERTY_IN_PERCENTS_NOT_SUPPORTED, Property.FONT_SIZE));
+        }
         PdfDocument doc = drawContext.getDocument();
         Rectangle area = flatRenderer.getOccupiedArea().getBBox().clone();
         PdfPage page = doc.getPage(occupiedArea.getPageNumber());
-        PdfFormField inputField = PdfFormField.createText(doc, area, name, value, font, fontSize);
+        PdfFormField inputField = PdfFormField.createText(doc, area, name, value, font, fontSize.getValue());
         inputField.setFieldFlag(PdfFormField.FF_MULTILINE, true);
         inputField.setDefaultValue(new PdfString(getDefaultValue()));
         applyDefaultFieldProperties(inputField);
@@ -178,9 +184,13 @@ protected void applyAcroField(DrawContext drawContext) {
     protected Float getContentWidth() {
         Float width = super.getContentWidth();
         if (width == null) {
-            float fontSize = (float) this.getPropertyAsFloat(Property.FONT_SIZE);
+            UnitValue fontSize = (UnitValue) this.getPropertyAsUnitValue(Property.FONT_SIZE);
+            if (!fontSize.isPointValue()) {
+                Logger logger = LoggerFactory.getLogger(TextAreaRenderer.class);
+                logger.error(MessageFormatUtil.format(com.itextpdf.io.LogMessageConstant.PROPERTY_IN_PERCENTS_NOT_SUPPORTED, Property.FONT_SIZE));
+            }
             int cols = getCols();
-            return fontSize * (cols * 0.5f + 2) + 2;
+            return fontSize.getValue() * (cols * 0.5f + 2) + 2;
         }
         return width;
     }