[RELEASE] iText pdfHtml 6.3.0

Author: iText-CI

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>9.3.0</version>
+    <version>9.4.0</version>
     <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>6.2.1</version>
+  <version>6.3.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
@@ -23,6 +23,12 @@
 
   <properties>
     <itext.version>${project.parent.version}</itext.version>
+
+    <sharpen.phase>install</sharpen.phase>
+    <sharpen.projectName>html2pdf</sharpen.projectName>
+    <sharpen.cSharpTargetFolder>./../../sharp/html2pdf</sharpen.cSharpTargetFolder>
+    <sharpen.cSharpSourceCodeDestination>itext/itext.html2pdf</sharpen.cSharpSourceCodeDestination>
+    <sharpen.cSharpTestCodeDestination>itext.tests/itext.html2pdf.tests</sharpen.cSharpTestCodeDestination>
   </properties>
 
   <dependencies>
@@ -129,50 +135,7 @@
       </plugin>
     </plugins>
   </build>
-
   <profiles>
-    <profile>
-      <id>with-sharpen</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>sharpen</groupId>
-            <artifactId>sharpen-maven-plugin</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <executions>
-              <execution>
-                <phase>install</phase>
-                <goals>
-                  <goal>sharpen</goal>
-                </goals>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>sharpen</groupId>
-                <artifactId>standard-framework-mapping</artifactId>
-                <version>1.0-SNAPSHOT</version>
-              </dependency>
-            </dependencies>
-            <configuration>
-              <projectName>html2pdf</projectName>
-              <cSharpTargetFolder>./../../sharp/html2pdf</cSharpTargetFolder>
-              <cSharpSourceCodeDestination>itext/itext.html2pdf</cSharpSourceCodeDestination>
-              <cSharpTestCodeDestination>itext.tests/itext.html2pdf.tests</cSharpTestCodeDestination>
-              <buildDotnet>${sharpen.builddotnet}</buildDotnet>
-              <showDiff>${sharpen.showdiff}</showDiff>
-              <sourceCodeFiles>
-                <file>**/src/main/java/**/*.java</file>
-              </sourceCodeFiles>
-              <testCodeFiles>
-                <file>**/src/test/java/**/*.java</file>
-              </testCodeFiles>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <id>native</id>
       <dependencies>

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 = "6.2.1";
+    private static final String PDF_HTML_VERSION = "6.3.0";
     private static final int PDF_HTML_COPYRIGHT_SINCE = 2000;
     private static final int PDF_HTML_COPYRIGHT_TO = 2025;
 

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

@@ -0,0 +1,60 @@
+/*
+    This file is part of the iText (R) project.
+    Copyright (c) 1998-2025 Apryse Group NV
+    Authors: Apryse Software.
+
+    This program is offered under a commercial and under the AGPL license.
+    For commercial licensing, contact us at https://itextpdf.com/sales.  For AGPL licensing, see below.
+
+    AGPL licensing:
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    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.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.itextpdf.html2pdf.attach;
+
+import com.itextpdf.styledxmlparser.node.INode;
+
+import java.util.List;
+import java.util.Stack;
+
+/**
+ * Utility class for document tree operations.
+ */
+public final class DocumentTreeUtil {
+
+    private DocumentTreeUtil() {
+        //Utility class should not be instantiated
+    }
+
+    /**
+     * Traverses a document tree starting from a specified node and performs a collection of jobs on each node.
+     *
+     * @param node node of the document tree to traverse
+     * @param jobs a collection of jobs to be executed on each node during the traversal
+     */
+    public static void traverse(INode node, List<IDocumentTreeJob> jobs) {
+        Stack<INode> stk = new Stack<>();
+        stk.push(node);
+        while (!stk.isEmpty()) {
+            INode n = stk.pop();
+            for (IDocumentTreeJob job : jobs) {
+                job.process(n, stk.size());
+            }
+            if (!n.childNodes().isEmpty()) {
+                for (int i = n.childNodes().size() - 1; i >= 0; i--) {
+                    stk.push(n.childNodes().get(i));
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+/*
+    This file is part of the iText (R) project.
+    Copyright (c) 1998-2025 Apryse Group NV
+    Authors: Apryse Software.
+
+    This program is offered under a commercial and under the AGPL license.
+    For commercial licensing, contact us at https://itextpdf.com/sales.  For AGPL licensing, see below.
+
+    AGPL licensing:
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    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.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.itextpdf.html2pdf.attach;
+
+import com.itextpdf.styledxmlparser.node.INode;
+
+/**
+ * Interface for document tree jobs.
+ */
+@FunctionalInterface
+public interface IDocumentTreeJob {
+    /**
+     * Processes a node within a document tree structure at a given level.
+     * <br>
+     * This method is used to perform specific operations on an {@link INode}
+     * based on the context of its hierarchical position in the document tree.
+     *
+     * @param node the node to process
+     * @param level the hierarchical level of the node in the document tree structure
+     */
+    void process(INode node, int level);
+}

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

@@ -27,6 +27,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.attach.impl.DefaultTagWorkerFactory;
 import com.itextpdf.html2pdf.attach.impl.HtmlMetaInfoContainer;
+import com.itextpdf.html2pdf.attach.impl.LabelContext;
 import com.itextpdf.html2pdf.attach.impl.LinkContext;
 import com.itextpdf.html2pdf.attach.impl.OutlineHandler;
 import com.itextpdf.html2pdf.css.apply.ICssApplierFactory;
@@ -138,6 +139,11 @@ public class ProcessorContext {
      */
     private LinkContext linkContext;
 
+    /**
+     * The label context
+     */
+    private LabelContext labelContext;
+
     /**
      * The PDF document.
      */
@@ -212,6 +218,7 @@ public ProcessorContext(ConverterProperties converterProperties) {
         cssContext = new CssContext();
         cssStyleSheet = null;
         linkContext = new LinkContext();
+        labelContext = new LabelContext();
 
         createAcroForm = converterProperties.isCreateAcroForm();
         formFieldNameResolver = new FormFieldNameResolver();
@@ -342,6 +349,15 @@ public LinkContext getLinkContext() {
         return linkContext;
     }
 
+    /**
+     * Gets the label context.
+     *
+     * @return the label context
+     */
+    public LabelContext getLabelContext() {
+        return labelContext;
+    }
+
     /**
      * Checks if is an AcroForm needs to be created.
      *
@@ -443,6 +459,7 @@ public void reset() {
         this.cssContext = new CssContext();
         this.cssStyleSheet = null;
         this.linkContext = new LinkContext();
+        this.labelContext = new LabelContext();
         this.formFieldNameResolver.reset();
         //Reset font provider. PdfFonts shall be reseted.
         this.fontProvider.reset();

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

@@ -31,14 +31,13 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.ProcessorContextCreator;
 import com.itextpdf.html2pdf.actions.events.PdfHtmlProductEvent;
-import com.itextpdf.html2pdf.attach.IHtmlProcessor;
-import com.itextpdf.html2pdf.attach.ITagWorker;
-import com.itextpdf.html2pdf.attach.ProcessorContext;
+import com.itextpdf.html2pdf.attach.*;
 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.tags.HtmlTagWorker;
 import com.itextpdf.html2pdf.attach.impl.tags.RunningElementTagWorker;
+import com.itextpdf.html2pdf.attach.util.AlternateDescriptionResolver;
 import com.itextpdf.html2pdf.attach.util.LinkHelper;
 import com.itextpdf.html2pdf.css.CssConstants;
 import com.itextpdf.html2pdf.css.apply.ICssApplier;
@@ -64,6 +63,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.properties.RenderingMode;
 import com.itextpdf.layout.renderer.DocumentRenderer;
 import com.itextpdf.layout.renderer.MetaInfoContainer;
+import com.itextpdf.layout.tagging.IAccessibleElement;
 import com.itextpdf.styledxmlparser.css.CssDeclaration;
 import com.itextpdf.styledxmlparser.css.CssFontFaceRule;
 import com.itextpdf.styledxmlparser.css.ICssResolver;
@@ -185,11 +185,7 @@ public List<com.itextpdf.layout.element.IElement> processElements(INode root) {
                 context.getMetaInfoContainer().getMetaInfo()));
 
         context.reset();
-        roots = new ArrayList<>();
-        cssResolver = new DefaultCssResolver(root, context);
-        context.setCssStyleSheet(((DefaultCssResolver) cssResolver).getCssStyleSheet());
-        context.getLinkContext().scanForIds(root);
-        addFontFaceFonts();
+        initContext(root);
         IElementNode html = findHtmlNode(root);
         IElementNode body = findBodyNode(root);
 
@@ -229,11 +225,7 @@ public Document processDocument(INode root, PdfDocument pdfDocument) {
         if (!context.hasFonts()) {
             throw new Html2PdfException(Html2PdfException.FONT_PROVIDER_CONTAINS_ZERO_FONTS);
         }
-        roots = new ArrayList<>();
-        cssResolver = new DefaultCssResolver(root, context);
-        context.setCssStyleSheet(((DefaultCssResolver) cssResolver).getCssStyleSheet());
-        context.getLinkContext().scanForIds(root);
-        addFontFaceFonts();
+        initContext(root);
         root = findHtmlNode(root);
 
         if (context.getCssContext().isNonPagesTargetCounterPresent()) {
@@ -265,6 +257,18 @@ public Document processDocument(INode root, PdfDocument pdfDocument) {
         return doc;
     }
 
+    private void initContext(INode root) {
+        roots = new ArrayList<>();
+        cssResolver = new DefaultCssResolver(root, context);
+        context.setCssStyleSheet(((DefaultCssResolver) cssResolver).getCssStyleSheet());
+        //Not using Arrays.asList because it can't derive types correctly in .NET
+        List<IDocumentTreeJob> jobs = new ArrayList<>();
+        jobs.add(context.getLinkContext());
+        jobs.add(context.getLabelContext());
+        DocumentTreeUtil.traverse(root, jobs);
+        addFontFaceFonts();
+    }
+
     /**
      * Recursively processes a node to preprocess target-counters.
      *
@@ -367,6 +371,11 @@ private void visit(INode node) {
                     tagWorker.getElementResult().setProperty(Property.COLLAPSING_MARGINS, Boolean.FALSE);
                     tagWorker.getElementResult().setProperty(Property.TREAT_AS_CONTINUOUS_CONTAINER, true);
                 }
+                IPropertyContainer result = tagWorker.getElementResult();
+                if (result instanceof IAccessibleElement) {
+                    context.getDIContainer().getInstance(AlternateDescriptionResolver.class)
+                            .resolveLabelableElement((IAccessibleElement) result, element, context);
+                }
             }
 
             element.setStyles(null);

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

@@ -90,6 +90,8 @@ class DefaultTagWorkerMapping {
         workerMapping.putMapping(TagConstants.ABBR, (lhs, rhs) -> new AbbrTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.ADDRESS, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.ARTICLE, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
+        workerMapping.putMapping(TagConstants.ARTICLE, CssConstants.FLEX,
+                (lhs, rhs) -> new DisplayFlexTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.ASIDE, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.B, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.BDI, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
@@ -114,16 +116,23 @@ class DefaultTagWorkerMapping {
         workerMapping.putMapping(TagConstants.FIELDSET, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.FIGCAPTION, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.FIGURE, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
+        workerMapping.putMapping(TagConstants.FIGURE, CssConstants.FLEX,
+                (lhs, rhs) -> new DisplayFlexTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.FONT, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.FOOTER, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
+        workerMapping.putMapping(TagConstants.FOOTER, CssConstants.FLEX,
+                (lhs, rhs) -> new DisplayFlexTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.FORM, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
+        workerMapping.putMapping(TagConstants.FORM, CssConstants.FLEX, (lhs, rhs) -> new DisplayFlexTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.H1, (lhs, rhs) -> new HTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.H2, (lhs, rhs) -> new HTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.H3, (lhs, rhs) -> new HTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.H4, (lhs, rhs) -> new HTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.H5, (lhs, rhs) -> new HTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.H6, (lhs, rhs) -> new HTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.HEADER, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
+        workerMapping.putMapping(TagConstants.HEADER, CssConstants.FLEX,
+                (lhs, rhs) -> new DisplayFlexTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.HR, (lhs, rhs) -> new HrTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.HTML, (lhs, rhs) -> new HtmlTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.I, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
@@ -149,6 +158,8 @@ class DefaultTagWorkerMapping {
         workerMapping.putMapping(TagConstants.S, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.SAMP, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.SECTION, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
+        workerMapping.putMapping(TagConstants.SECTION, CssConstants.FLEX,
+                (lhs, rhs) -> new DisplayFlexTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.SELECT, (lhs, rhs) -> new SelectTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.SMALL, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.SPAN, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
@@ -257,9 +268,11 @@ TagProcessorMapping<ITagWorkerCreator> getDefaultTagWorkerMapping() {
     public interface ITagWorkerCreator {
         /**
          * Creates an {@link ITagWorker} instance.
-         * @param elementNode tag worker element node.
-         * @param processorContext processor context.
-         * @return {@link ITagWorker} instance.
+         *
+         * @param elementNode tag worker element node
+         * @param processorContext processor context
+         *
+         * @return {@link ITagWorker} instance
          */
         ITagWorker create(IElementNode elementNode, ProcessorContext processorContext);
     }