[RELEASE] iText pdfHtml 6.2.0

Author: iText-CI

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>9.1.0</version>
+    <version>9.2.0</version>
     <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>6.1.0</version>
+  <version>6.2.0</version>
 
   <name>pdfHTML</name>
   <description>pdfHTML is an iText add-on that lets you to parse (X)HTML snippets and the associated CSS and converts
@@ -62,7 +62,6 @@
       <groupId>com.itextpdf</groupId>
       <artifactId>pdfua</artifactId>
       <version>${itext.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -106,6 +105,12 @@
           <include>**/*.json</include>
         </includes>
       </resource>
+      <resource>
+        <directory>src/main/resources/com/itextpdf/html2pdf</directory>
+        <includes>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
     </resources>
     <plugins>
       <plugin>
@@ -148,11 +153,6 @@
                 <artifactId>standard-framework-mapping</artifactId>
                 <version>1.0-SNAPSHOT</version>
               </dependency>
-              <dependency>
-                <groupId>sharpen</groupId>
-                <artifactId>html2pdf-sharpen-mapping</artifactId>
-                <version>1.0-SNAPSHOT</version>
-              </dependency>
             </dependencies>
             <configuration>
               <projectName>html2pdf</projectName>

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

@@ -25,14 +25,19 @@ This file is part of the iText (R) project.
 import com.itextpdf.commons.actions.contexts.IMetaInfo;
 import com.itextpdf.html2pdf.attach.ITagWorkerFactory;
 import com.itextpdf.html2pdf.attach.impl.OutlineHandler;
+import com.itextpdf.html2pdf.attach.util.AlternateDescriptionResolver;
 import com.itextpdf.html2pdf.css.apply.ICssApplierFactory;
 import com.itextpdf.kernel.pdf.PdfAConformance;
+import com.itextpdf.kernel.pdf.PdfConformance;
 import com.itextpdf.kernel.pdf.PdfOutputIntent;
+import com.itextpdf.kernel.pdf.PdfUAConformance;
 import com.itextpdf.layout.font.FontProvider;
 import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
 import com.itextpdf.styledxmlparser.resolver.resource.IResourceRetriever;
 
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Properties that will be used by the {@link com.itextpdf.html2pdf.HtmlConverter}.
@@ -44,6 +49,8 @@ public class ConverterProperties {
      */
     private static final int DEFAULT_LIMIT_OF_LAYOUTS = 10;
 
+    private final HashMap<Class<?>, Object> dependencies = new HashMap<>();
+
     /**
      * The media device description.
      */
@@ -117,12 +124,13 @@ public class ConverterProperties {
     /**
      * Conformance for conversion to pdf/a.
      */
-    private PdfAConformance aConformance;
+    private PdfConformance conformance = new PdfConformance();
 
     /**
      * Instantiates a new {@link ConverterProperties} instance.
      */
     public ConverterProperties() {
+        this.dependencies.put(AlternateDescriptionResolver.class, new AlternateDescriptionResolver());
     }
 
     /**
@@ -145,6 +153,11 @@ public ConverterProperties(ConverterProperties other) {
         this.limitOfLayouts = other.limitOfLayouts;
         this.immediateFlush = other.immediateFlush;
         this.continuousContainerEnabled = other.continuousContainerEnabled;
+        this.conformance = other.conformance;
+        this.outputIntent = other.outputIntent;
+        for (Class<?> aClass : other.dependencies.keySet()) {
+            this.dependencies.put(aClass, other.dependencies.get(aClass));
+        }
     }
 
     /**
@@ -344,7 +357,6 @@ public boolean isCreateAcroForm() {
      * When enabling this acroform creation, it will disable the immediateFlushing property.
      *
      * @param createAcroForm true if an AcroForm needs to be created
-     *
      * @return the {@link ConverterProperties} instance
      */
     public ConverterProperties setCreateAcroForm(boolean createAcroForm) {
@@ -410,16 +422,28 @@ public ConverterProperties setCharset(String charset) {
         return this;
     }
 
+    /**
+     * Gets pdf document output intent (final destination device) to reproduce the color in the PDF.
+     *
+     * <p>
+     * Note, output intent isn't applicable for HtmlConverter#convertToElements methods
+     * (e.g. {@link HtmlConverter#convertToElements(InputStream, ConverterProperties)})
+     *
+     * @return pdf output intent
+     */
+    public PdfOutputIntent getDocumentOutputIntent() {
+        return outputIntent;
+    }
+
     /**
      * Sets pdf document output intent (final destination device) to reproduce the color in the PDF.
-     * Required parameter, when converting to pdf/a one have to specify an explicit output intent.
+     * Required parameter, when converting to pdf/a one has to specify an explicit output intent.
      *
      * <p>
      * Note, output intent isn't applicable for HtmlConverter#convertToElements methods
      * (e.g. {@link HtmlConverter#convertToElements(InputStream, ConverterProperties)})
      *
      * @param outputIntent a {@link PdfOutputIntent} instance
-     *
      * @return the {@link ConverterProperties} instance
      */
     public ConverterProperties setDocumentOutputIntent(PdfOutputIntent outputIntent) {
@@ -428,38 +452,45 @@ public ConverterProperties setDocumentOutputIntent(PdfOutputIntent outputIntent)
     }
 
     /**
-     * Sets the generation and strictness level of the PDF/A that must be followed.
-     * Required parameter, when converting to pdf/a one have to specify an explicit pdf/a conformance.
+     * Gets the generation and strictness level of the PDF/A that must be followed.
      *
-     * @param conformance a {@link PdfAConformance} constant
+     * @return pdf/a conformance
+     */
+    public PdfAConformance getPdfAConformance() {
+        return conformance.getAConformance();
+    }
+
+    /**
+     * Sets the generation and strictness level of the PDF/A that must be followed.
+     * Required parameter, when converting to pdf/a one has to specify an explicit pdf/a conformance.
      *
+     * @param aConformance a {@link PdfAConformance} constant
      * @return the {@link ConverterProperties} instance
      */
-    public ConverterProperties setPdfAConformance(PdfAConformance conformance) {
-        this.aConformance = conformance;
+    public ConverterProperties setPdfAConformance(PdfAConformance aConformance) {
+        this.conformance = new PdfConformance(aConformance, conformance.getUAConformance());
         return this;
     }
 
     /**
-     * Gets pdf document output intent (final destination device) to reproduce the color in the PDF.
+     * Gets the generation and strictness level of the PDF/UA that must be followed.
      *
-     * <p>
-     * Note, output intent isn't applicable for HtmlConverter#convertToElements methods
-     * (e.g. {@link HtmlConverter#convertToElements(InputStream, ConverterProperties)})
-     *
-     * @return pdf output intent
+     * @return The PDF/UA conformance level.
      */
-    public PdfOutputIntent getDocumentOutputIntent() {
-        return outputIntent;
+    public PdfUAConformance getPdfUaConformance() {
+        return conformance.getUAConformance();
     }
 
     /**
-     * Gets the generation and strictness level of the PDF/A that must be followed.
+     * Sets the generation and strictness level of the PDF/UA that must be followed.
+     * Required parameter, when converting to PDF/UA one has to specify an explicit PDF/UA conformance.
      *
-     * @return pdf/a conformance
+     * @param uaConformance a {@link PdfUAConformance} constant
+     * @return the {@link ConverterProperties} instance
      */
-    public PdfAConformance getPdfAConformance() {
-        return aConformance;
+    public ConverterProperties setPdfUAConformance(PdfUAConformance uaConformance) {
+        this.conformance = new PdfConformance(conformance.getAConformance(), uaConformance);
+        return this;
     }
 
     /**
@@ -535,4 +566,13 @@ public ConverterProperties setContinuousContainerEnabled(boolean value) {
         continuousContainerEnabled = value;
         return this;
     }
+
+    /**
+     * Gets the dependencies.
+     *
+     * @return the dependencies
+     */
+    public Map<Class<?>, Object> getDependencies() {
+        return dependencies;
+    }
 }