[RELEASE] iText pdfHtml 6.2.1

Author: iText-CI

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>9.2.0</version>
+    <version>9.3.0</version>
     <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>6.2.0</version>
+  <version>6.2.1</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

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.0";
+    private static final String PDF_HTML_VERSION = "6.2.1";
     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/impl/OutlineHandler.java

@@ -34,9 +34,12 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.action.PdfAction;
 import com.itextpdf.layout.element.IElement;
 import com.itextpdf.layout.properties.Property;
+import com.itextpdf.styledxmlparser.CommonAttributeConstants;
 import com.itextpdf.styledxmlparser.node.IElementNode;
 import com.itextpdf.styledxmlparser.node.impl.jsoup.node.JsoupElementNode;
 
+import java.util.HashSet;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -299,7 +302,8 @@ protected OutlineHandler addOutlineAndDestToDocument(ITagWorker tagWorker, IElem
                 levelsInProcess.pop();
             }
             PdfOutline outline = parent.addOutline(generateOutlineName(element));
-            String destination = generateUniqueDestinationName(element);
+            String destination = element.getAttribute(CommonAttributeConstants.ID) == null
+                    ? generateUniqueDestinationName(element) : element.getAttribute(CommonAttributeConstants.ID);
             PdfAction action = PdfAction.createGoTo(destination);
             outline.addAction(action);
             destinationsInProcess.push(new Tuple2<String, PdfDictionary>(destination, action.getPdfObject()));
@@ -326,7 +330,13 @@ protected OutlineHandler setDestinationToElement(ITagWorker tagWorker, IElementN
         if (null != tagWorker && hasMarkPriorityMapping(markName) && destinationsInProcess.size() > 0) {
             Tuple2<String, PdfDictionary> content = destinationsInProcess.pop();
             if (tagWorker.getElementResult() instanceof IElement) {
-                tagWorker.getElementResult().setProperty(Property.DESTINATION, content);
+                Set<Object> existingDestinations =
+                        tagWorker.getElementResult().<Set<Object>>getProperty(Property.DESTINATION);
+                if (existingDestinations == null) {
+                    existingDestinations = new HashSet<>();
+                }
+                existingDestinations.add(content);
+                tagWorker.getElementResult().setProperty(Property.DESTINATION, existingDestinations);
             } else {
                 Logger logger = LoggerFactory.getLogger(OutlineHandler.class);
                 logger.warn(MessageFormatUtil.format(

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/ABlockTagWorker.java

@@ -23,15 +23,14 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.attach.impl.tags;
 
 import com.itextpdf.html2pdf.attach.ProcessorContext;
+import com.itextpdf.html2pdf.attach.impl.tags.util.ATagUtil;
 import com.itextpdf.html2pdf.attach.util.LinkHelper;
-import com.itextpdf.kernel.pdf.tagging.StandardRoles;
-import com.itextpdf.layout.element.Div;
-import com.itextpdf.layout.properties.Property;
 import com.itextpdf.html2pdf.html.AttributeConstants;
+import com.itextpdf.layout.properties.Property;
 import com.itextpdf.styledxmlparser.node.IElementNode;
-import com.itextpdf.styledxmlparser.resolver.resource.UriResolver;
 
-import java.net.MalformedURLException;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * TagWorker class for a link block.
@@ -57,26 +56,20 @@ public void processEnd(IElementNode element, ProcessorContext context) {
 
         String url = element.getAttribute(AttributeConstants.HREF);
         if (url != null) {
-            String base = context.getBaseUri();
-            if (base != null) {
-                UriResolver uriResolver = new UriResolver(base);
-                if (!(url.startsWith("#") && uriResolver.isLocalBaseUri()))
-                    try {
-                        String resolvedUri = uriResolver.resolveAgainstBaseUri(url).toExternalForm();
-                        if (!url.endsWith("/") && resolvedUri.endsWith("/"))
-                            resolvedUri = resolvedUri.substring(0, resolvedUri.length() - 1);
-                        if (!resolvedUri.startsWith("file:"))
-                            url = resolvedUri;
-                    } catch (MalformedURLException exception) {
-                    }
-            }
-            ((Div) getElementResult()).getAccessibilityProperties().setRole(StandardRoles.LINK);
-            LinkHelper.applyLinkAnnotation(getElementResult(), url, context, element);
+            String anchorLink = element.getAttribute(AttributeConstants.HREF);
+            String baseUri = context.getBaseUri();
+            String modifiedUrl = ATagUtil.resolveAnchorLink(anchorLink, baseUri);
+            LinkHelper.applyLinkAnnotation(getElementResult(), modifiedUrl, context, element);
         }
 
         if (getElementResult() != null) {
             String name = element.getAttribute(AttributeConstants.NAME);
-            getElementResult().setProperty(Property.DESTINATION, name);
+            Set<Object> existingDestinations = getElementResult().<Set<Object>>getProperty(Property.DESTINATION);
+            if (existingDestinations == null) {
+                existingDestinations = new HashSet<>();
+            }
+            existingDestinations.add(name);
+            getElementResult().setProperty(Property.DESTINATION, existingDestinations);
         }
     }
 }

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/ATagWorker.java

@@ -24,19 +24,19 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.attach.ProcessorContext;
 import com.itextpdf.html2pdf.attach.impl.layout.RunningElement;
+import com.itextpdf.html2pdf.attach.impl.tags.util.ATagUtil;
 import com.itextpdf.html2pdf.attach.util.LinkHelper;
-import com.itextpdf.kernel.pdf.tagging.StandardRoles;
+import com.itextpdf.html2pdf.html.AttributeConstants;
 import com.itextpdf.layout.IPropertyContainer;
 import com.itextpdf.layout.element.Div;
 import com.itextpdf.layout.element.IBlockElement;
 import com.itextpdf.layout.properties.FloatPropertyValue;
 import com.itextpdf.layout.properties.Property;
 import com.itextpdf.layout.properties.Transform;
-import com.itextpdf.html2pdf.html.AttributeConstants;
 import com.itextpdf.styledxmlparser.node.IElementNode;
-import com.itextpdf.styledxmlparser.resolver.resource.UriResolver;
 
-import java.net.MalformedURLException;
+import java.util.HashSet;
+import java.util.Set;
 
 
 /**
@@ -63,26 +63,15 @@ public void processEnd(IElementNode element, ProcessorContext context) {
 
         String url = element.getAttribute(AttributeConstants.HREF);
         if (url != null) {
-            String base = context.getBaseUri();
-            if (base != null) {
-                UriResolver uriResolver = new UriResolver(base);
-                if (!(url.startsWith("#") && uriResolver.isLocalBaseUri()))
-                    try {
-                        String resolvedUri = uriResolver.resolveAgainstBaseUri(url).toExternalForm();
-                        if (!url.endsWith("/") && resolvedUri.endsWith("/"))
-                            resolvedUri = resolvedUri.substring(0, resolvedUri.length() - 1);
-                        if (!resolvedUri.startsWith("file:"))
-                            url = resolvedUri;
-                    } catch (MalformedURLException exception) {
-                    }
-            }
+            String anchorLink = element.getAttribute(AttributeConstants.HREF);
+            String baseUri = context.getBaseUri();
+            String modifiedUrl = ATagUtil.resolveAnchorLink(anchorLink, baseUri);
             for (int i = 0; i < getAllElements().size(); i++) {
                 if (getAllElements().get(i) instanceof RunningElement) {
                     continue;
                 }
                 if (getAllElements().get(i) instanceof IBlockElement) {
                     Div simulatedDiv = new Div();
-                    simulatedDiv.getAccessibilityProperties().setRole(StandardRoles.LINK);
                     Transform cssTransform = getAllElements().get(i).<Transform>getProperty(Property.TRANSFORM);
                     if (cssTransform != null) {
                         getAllElements().get(i).deleteOwnProperty(Property.TRANSFORM);
@@ -100,14 +89,19 @@ public void processEnd(IElementNode element, ProcessorContext context) {
                     }
                     getAllElements().set(i, simulatedDiv);
                 }
-                LinkHelper.applyLinkAnnotation(getAllElements().get(i), url, context, element);
+                LinkHelper.applyLinkAnnotation(getAllElements().get(i), modifiedUrl, context, element);
             }
         }
 
         if (!getAllElements().isEmpty()) {
             String name = element.getAttribute(AttributeConstants.NAME);
             IPropertyContainer firstElement = getAllElements().get(0);
-            firstElement.setProperty(Property.DESTINATION, name);
+            Set<Object> existingDestinations = firstElement.<Set<Object>>getProperty(Property.DESTINATION);
+            if (existingDestinations == null) {
+                existingDestinations = new HashSet<>();
+            }
+            existingDestinations.add(name);
+            firstElement.setProperty(Property.DESTINATION, existingDestinations);
             firstElement.setProperty(Property.ID, name);
         }
     }

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/BrTagWorker.java

@@ -26,10 +26,12 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.attach.ProcessorContext;
 import com.itextpdf.html2pdf.attach.util.AccessiblePropHelper;
 import com.itextpdf.html2pdf.css.CssConstants;
+import com.itextpdf.kernel.pdf.tagging.StandardRoles;
 import com.itextpdf.layout.IPropertyContainer;
 import com.itextpdf.layout.element.Text;
-import com.itextpdf.styledxmlparser.util.FontFamilySplitterUtil;
 import com.itextpdf.styledxmlparser.node.IElementNode;
+import com.itextpdf.styledxmlparser.util.FontFamilySplitterUtil;
+
 import java.util.List;
 
 /**
@@ -38,7 +40,7 @@ This file is part of the iText (R) project.
 public class BrTagWorker implements ITagWorker {
 
     /** A new line Text element. */
-    private Text newLine = new Text("\n");
+    private final Text newLine;
 
     /**
      * Creates a new {@link BrTagWorker} instance.
@@ -47,6 +49,8 @@ public class BrTagWorker implements ITagWorker {
      * @param context the context
      */
     public BrTagWorker(IElementNode element, ProcessorContext context) {
+        newLine = new Text("\n");
+        newLine.getAccessibilityProperties().setRole(StandardRoles.ARTIFACT);
         //There is no mappings for BR element in DefaultTagCssApplierMapping,
         // because only font-family should be applied to <br /> element.
         String fontFamily = element.getStyles().get(CssConstants.FONT_FAMILY);

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/util/ATagUtil.java

@@ -0,0 +1,64 @@
+/*
+    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.impl.tags.util;
+
+import com.itextpdf.styledxmlparser.resolver.resource.UriResolver;
+
+import java.net.MalformedURLException;
+
+/**
+ * Utility class to work with the data in A tag.
+ */
+public final class ATagUtil {
+
+    private ATagUtil() {
+        //Empty constructor
+    }
+
+    /**
+     * Resolves a link in A tag.
+     *
+     * @param anchorLink the link in A tag
+     * @param baseUrl the base URL
+     *
+     * @return the resolved link
+     */
+    public static String resolveAnchorLink(String anchorLink, String baseUrl) {
+        if (baseUrl != null) {
+            UriResolver uriResolver = new UriResolver(baseUrl);
+            if (!anchorLink.startsWith("#")) {
+                try {
+                    String resolvedUri = uriResolver.resolveAgainstBaseUri(anchorLink).toExternalForm();
+                    if (!anchorLink.endsWith("/") && resolvedUri.endsWith("/")) {
+                        resolvedUri = resolvedUri.substring(0, resolvedUri.length() - 1);
+                    }
+                    if (!resolvedUri.startsWith("file:")) {
+                        return resolvedUri;
+                    }
+                } catch (MalformedURLException exception) {
+                }
+            }
+        }
+        return anchorLink;
+    }
+}

src/main/java/com/itextpdf/html2pdf/attach/util/LinkHelper.java

@@ -32,15 +32,20 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfArray;
 import com.itextpdf.kernel.pdf.PdfDictionary;
+import com.itextpdf.kernel.pdf.PdfVersion;
 import com.itextpdf.kernel.pdf.action.PdfAction;
 import com.itextpdf.kernel.pdf.annot.PdfAnnotation;
 import com.itextpdf.kernel.pdf.annot.PdfLinkAnnotation;
+import com.itextpdf.kernel.pdf.tagging.PdfNamespace;
 import com.itextpdf.kernel.pdf.tagging.StandardRoles;
+import com.itextpdf.kernel.pdf.tagutils.AccessibilityProperties;
 import com.itextpdf.layout.IPropertyContainer;
-import com.itextpdf.layout.element.ILeafElement;
 import com.itextpdf.layout.properties.Property;
 import com.itextpdf.layout.tagging.IAccessibleElement;
 import com.itextpdf.styledxmlparser.node.IElementNode;
+
+import java.util.HashSet;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -100,11 +105,17 @@ public static void applyLinkAnnotation(IPropertyContainer container, String url,
 
             }
 
-
             linkAnnotation.setBorder(new PdfArray(new float[]{0, 0, 0}));
             container.setProperty(Property.LINK_ANNOTATION, linkAnnotation);
-            if (container instanceof ILeafElement && container instanceof IAccessibleElement) {
-                ((IAccessibleElement) container).getAccessibilityProperties().setRole(StandardRoles.LINK);
+            if (container instanceof IAccessibleElement) {
+                AccessibilityProperties accessibilityProperties =
+                        ((IAccessibleElement) container).getAccessibilityProperties();
+                String role = linkAnnotation.getRoleBasedOnDestination(context.getPdfDocument());
+                if (StandardRoles.REFERENCE.equals(role) && context.getPdfDocument() != null &&
+                        PdfVersion.PDF_2_0.compareTo(context.getPdfDocument().getPdfVersion()) <= 0) {
+                    accessibilityProperties.setNamespace(PdfNamespace.getDefault(context.getPdfDocument()));
+                }
+                accessibilityProperties.setRole(role);
             }
         }
     }
@@ -138,8 +149,12 @@ public static void createDestination(ITagWorker tagWorker, IElementNode element,
                 context.getLinkContext().addLinkAnnotation(id, linkAnnotation);
             }
 
-            propertyContainer.setProperty(Property.DESTINATION, new Tuple2<String, PdfDictionary>(id,
-                    linkAnnotation.getAction()));
+            Set<Object> existingDestinations = propertyContainer.<Set<Object>>getProperty(Property.DESTINATION);
+            if (existingDestinations == null) {
+                existingDestinations = new HashSet<>();
+            }
+            existingDestinations.add(new Tuple2<String, PdfDictionary>(id, linkAnnotation.getAction()));
+            propertyContainer.setProperty(Property.DESTINATION, existingDestinations);
         }
         if (propertyContainer != null) {
             propertyContainer.setProperty(Property.ID, id);

src/main/java/com/itextpdf/html2pdf/css/apply/impl/PageMarginBoxCssApplier.java

@@ -111,7 +111,7 @@ public void apply(ProcessorContext context, IStylesContainer stylesContainer, IT
             marginBox.setProperty(Property.OVERFLOW_Y, OverflowPropertyValue.VISIBLE);
         }
 
-        //TODO DEVSIX-7024 Support outlines for page margin boxes
+        //TODO DEVSIX-5725 support 'ouline' property for page margin boxes
         OutlineApplierUtil.applyOutlines(boxStyles, context, marginBox);
 
         marginBox.setProperty(Property.FONT_PROVIDER, context.getFontProvider());

src/main/java/com/itextpdf/html2pdf/css/apply/util/FlexApplierUtil.java

@@ -253,9 +253,15 @@ private static void applyAlignContent(Map<String, String> cssProps, IPropertyCon
         if (alignContentString != null) {
             AlignContentPropertyValue alignContent;
             switch (alignContentString) {
+                case CommonCssConstants.START:
+                    alignContent = AlignContentPropertyValue.START;
+                    break;
                 case CommonCssConstants.FLEX_START:
                     alignContent = AlignContentPropertyValue.FLEX_START;
                     break;
+                case CommonCssConstants.END:
+                    alignContent = AlignContentPropertyValue.END;
+                    break;
                 case CommonCssConstants.FLEX_END:
                     alignContent = AlignContentPropertyValue.FLEX_END;
                     break;
@@ -326,7 +332,9 @@ private static Map<String, Set<String>> createSupportedFlexContainerPropertiesAn
         supportedAlignContentValues.add(CommonCssConstants.STRETCH);
         supportedAlignContentValues.add(CommonCssConstants.NORMAL);
         supportedAlignContentValues.add(CommonCssConstants.FLEX_START);
+        supportedAlignContentValues.add(CommonCssConstants.START);
         supportedAlignContentValues.add(CommonCssConstants.FLEX_END);
+        supportedAlignContentValues.add(CommonCssConstants.END);
         supportedAlignContentValues.add(CommonCssConstants.CENTER);
         supportedAlignContentValues.add(CommonCssConstants.SPACE_AROUND);
         supportedAlignContentValues.add(CommonCssConstants.SPACE_BETWEEN);