[RELEASE] iText 7 pdfHTML 4.0.1

Author: iText-CI

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.2.0</version>
+    <version>7.2.1</version>
     <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>4.0.0</version>
+  <version>4.0.1</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

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 = "4.0.0";
+    private static final String PDF_HTML_VERSION = "4.0.1";
     private static final int PDF_HTML_COPYRIGHT_SINCE = 2000;
     private static final int PDF_HTML_COPYRIGHT_TO = 2021;
 

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

@@ -196,6 +196,7 @@ class DefaultTagWorkerMapping {
         workerMapping.putMapping(TagConstants.UL, CssConstants.INLINE, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.LI, CssConstants.INLINE, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.LI, CssConstants.INLINE_BLOCK, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
+        workerMapping.putMapping(TagConstants.LI, CssConstants.BLOCK, (lhs, rhs) -> new DivTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.DD, CssConstants.INLINE, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
         workerMapping.putMapping(TagConstants.DT, CssConstants.INLINE, (lhs, rhs) -> new SpanTagWorker(lhs, rhs));
 

src/main/java/com/itextpdf/html2pdf/css/CssConstants.java

@@ -76,6 +76,9 @@ public class CssConstants extends CommonCssConstants {
     /** The Constant DISPLAY. */
     public static final String DISPLAY = "display";
 
+    /** The Constant LIST_ITEM. */
+    public static final String LIST_ITEM = "list-item";
+
     /** The Constant MARKS. */
     public static final String MARKS = "marks";
 

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

@@ -154,6 +154,7 @@ class DefaultTagCssApplierMapping {
         mapping.putMapping(TagConstants.UL, CssConstants.INLINE, () -> new SpanTagCssApplier());
         mapping.putMapping(TagConstants.LI, CssConstants.INLINE, () -> new SpanTagCssApplier());
         mapping.putMapping(TagConstants.LI, CssConstants.INLINE_BLOCK, () -> new BlockCssApplier());
+        mapping.putMapping(TagConstants.LI, CssConstants.BLOCK, () -> new BlockCssApplier());
         mapping.putMapping(TagConstants.DD, CssConstants.INLINE, () -> new SpanTagCssApplier());
         mapping.putMapping(TagConstants.DT, CssConstants.INLINE, () -> new SpanTagCssApplier());
 

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

@@ -128,11 +128,9 @@ public void apply(ProcessorContext context, IStylesContainer stylesContainer, IT
     protected void applyChildElementStyles(IPropertyContainer element, Map<String, String> css, ProcessorContext context, IStylesContainer stylesContainer) {
         FontStyleApplierUtil.applyFontStyles(css, context, stylesContainer, element);
         BackgroundApplierUtil.applyBackground(css, context, element);
-        //TODO: Border-applying currently doesn't work in html way for spans inside other spans.
         BorderStyleApplierUtil.applyBorders(css, context, element);
         OutlineApplierUtil.applyOutlines(css, context, element);
         HyphenationApplierUtil.applyHyphenation(css, context, stylesContainer, element);
-        //TODO: Margins-applying currently doesn't work in html way for spans inside other spans. (see SpanTest#spanTest07)
         MarginApplierUtil.applyMargins(css, context, element);
         PositionApplierUtil.applyPosition(css, context, element);
         FloatApplierUtil.applyFloating(css, context, element);

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

@@ -139,10 +139,16 @@ public static void applyFontStyles(Map<String, String> cssProps, ProcessorContex
         String direction = cssProps.get(CssConstants.DIRECTION);
         if (CssConstants.RTL.equals(direction)) {
             element.setProperty(Property.BASE_DIRECTION, BaseDirection.RIGHT_TO_LEFT);
-            element.setProperty(Property.TEXT_ALIGNMENT, TextAlignment.RIGHT);
+            // For list items default behaviour differs from other elements:
+            // only the list symbol should be aligned differently
+            if (!CssConstants.LIST_ITEM.equals(cssProps.get(CssConstants.DISPLAY))){
+                element.setProperty(Property.TEXT_ALIGNMENT, TextAlignment.RIGHT);
+            }
         } else if (CssConstants.LTR.equals(direction)) {
             element.setProperty(Property.BASE_DIRECTION, BaseDirection.LEFT_TO_RIGHT);
-            element.setProperty(Property.TEXT_ALIGNMENT, TextAlignment.LEFT);
+            if (!CssConstants.LIST_ITEM.equals(cssProps.get(CssConstants.DISPLAY))){
+                element.setProperty(Property.TEXT_ALIGNMENT, TextAlignment.LEFT);
+            }
         }
 
         if (stylesContainer instanceof IElementNode && ((IElementNode) stylesContainer).parentNode() instanceof IElementNode &&

src/main/java/com/itextpdf/html2pdf/html/HtmlUtils.java

@@ -49,8 +49,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.numbering.GeorgianNumbering;
 import com.itextpdf.kernel.numbering.GreekAlphabetNumbering;
 import com.itextpdf.kernel.numbering.RomanNumbering;
-import com.itextpdf.styledxmlparser.css.util.CssUtils;
-import com.itextpdf.styledxmlparser.node.IElementNode;
 
 /**
  * Utilities class with HTML-related functionality.
@@ -122,7 +120,7 @@ private HtmlUtils() {
      */
     public static String convertNumberAccordingToGlyphStyle(CounterDigitsGlyphStyle glyphStyle, int number) {
         if (glyphStyle == null) {
-            return String.valueOf(number);
+            return convertNumberDefault(number);
         }
         switch (glyphStyle) {
             case NONE:
@@ -135,30 +133,35 @@ public static String convertNumberAccordingToGlyphStyle(CounterDigitsGlyphStyle
                 return CIRCLE_SYMBOL;
             case UPPER_ALPHA_AND_LATIN:
                 return number > 0 ? EnglishAlphabetNumbering.toLatinAlphabetNumberUpperCase(number)
-                        : String.valueOf(number);
+                        : convertNumberDefault(number);
             case LOWER_ALPHA_AND_LATIN:
                 return number > 0 ? EnglishAlphabetNumbering.toLatinAlphabetNumberLowerCase(number)
-                        : String.valueOf(number);
+                        : convertNumberDefault(number);
             case LOWER_GREEK:
                 return number > 0 ? GreekAlphabetNumbering.toGreekAlphabetNumberLowerCase(number)
-                        : String.valueOf(number);
+                        : convertNumberDefault(number);
             case LOWER_ROMAN:
                 return number <= MAX_ROMAN_NUMBER ? RomanNumbering.toRomanLowerCase(number)
-                        : String.valueOf(number);
+                        : convertNumberDefault(number);
             case UPPER_ROMAN:
                 return number <= MAX_ROMAN_NUMBER ? RomanNumbering.toRomanUpperCase(number)
-                        : String.valueOf(number);
+                        : convertNumberDefault(number);
             case DECIMAL_LEADING_ZERO:
-                return (number < 10 ? "0" : "") + String.valueOf(number);
+                return (number < 10 ? "0" : "") + convertNumberDefault(number);
             case GEORGIAN:
                 return GeorgianNumbering.toGeorgian(number);
             case ARMENIAN:
                 return ArmenianNumbering.toArmenian(number);
+            case DEFAULT:
             default:
-                return String.valueOf(number); //TODO
+                return convertNumberDefault(number);
         }
     }
 
+    private static String convertNumberDefault(int number) {
+        return String.valueOf(number);
+    }
+
     /**
      * Gets a string which contains all glyphs which can be used in number according to given glyph style.
      *

src/main/resources/com/itextpdf/html2pdf/NOTICE.txt

@@ -105,3 +105,4 @@ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
 OTHER DEALINGS IN THE FONT SOFTWARE.
+

src/test/java/com/itextpdf/html2pdf/Html2PdfTest.java

@@ -42,169 +42,103 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.html2pdf;
 
-import com.itextpdf.html2pdf.attach.IHtmlProcessor;
-import com.itextpdf.html2pdf.attach.impl.DefaultHtmlProcessor;
-import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider;
 import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
-import com.itextpdf.io.logs.IoLogMessageConstant;
-import com.itextpdf.io.util.UrlUtil;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfWriter;
-import com.itextpdf.kernel.utils.CompareTool;
-import com.itextpdf.layout.Document;
-import com.itextpdf.layout.font.FontProvider;
-import com.itextpdf.styledxmlparser.IXmlParser;
 import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
-import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
-import com.itextpdf.styledxmlparser.css.media.MediaType;
-import com.itextpdf.styledxmlparser.node.IDocumentNode;
-import com.itextpdf.styledxmlparser.node.impl.jsoup.JsoupHtmlParser;
-import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.IntegrationTest;
 
-import java.io.FileInputStream;
-import org.junit.Assert;
+import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.io.File;
-import java.io.IOException;
-
 @Category(IntegrationTest.class)
-public class Html2PdfTest extends ExtendedITextTest {
+public class Html2PdfTest extends ExtendedHtmlConversionITextTest {
 
-    public static final String sourceFolder = "./src/test/resources/com/itextpdf/html2pdf/Html2PdfTest/";
-    public static final String destinationFolder = "./target/test/com/itextpdf/html2pdf/Html2PdfTest/";
+    public static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/html2pdf/Html2PdfTest/";
+    public static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/html2pdf/Html2PdfTest/";
 
     @BeforeClass
     public static void beforeClass() {
-        createDestinationFolder(destinationFolder);
+        createOrClearDestinationFolder(DESTINATION_FOLDER);
     }
 
     @Test
     public void helloWorldParagraphTest() throws IOException, InterruptedException {
-        convertAndCompare(sourceFolder + "hello_paragraph.html", destinationFolder + "hello_paragraph.pdf",
-                sourceFolder + "cmp_hello_paragraph.pdf", destinationFolder, "diff01_");
+        convertToPdfAndCompare("hello_paragraph", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
-    // TODO DEVSIX-1124
     public void helloParagraphTableTest() throws IOException, InterruptedException {
-        convertAndCompare(sourceFolder + "hello_paragraph_table.html", destinationFolder + "hello_paragraph_table.pdf",
-                sourceFolder + "cmp_hello_paragraph_table.pdf", destinationFolder, "diff02_");
+        convertToPdfAndCompare("hello_paragraph_table", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
     public void helloMalformedDocumentTest() throws IOException, InterruptedException {
-        convertAndCompare(sourceFolder + "hello_malformed.html", destinationFolder + "hello_malformed.pdf",
-                sourceFolder + "cmp_hello_malformed.pdf", destinationFolder, "diff03_");
+        convertToPdfAndCompare("hello_malformed", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
     public void helloParagraphJunkSpacesDocumentTest() throws IOException, InterruptedException {
-        convertAndCompare(sourceFolder + "hello_paragraph_junk_spaces.html", destinationFolder + "hello_paragraph_junk_spaces.pdf",
-                sourceFolder + "cmp_hello_paragraph_junk_spaces.pdf", destinationFolder, "diff03_");
+        convertToPdfAndCompare("hello_paragraph_junk_spaces", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
-    // TODO DEVSIX-1124
     public void helloParagraphNestedInTableDocumentTest() throws IOException, InterruptedException {
-        convertAndCompare(sourceFolder + "hello_paragraph_nested_in_table.html", destinationFolder + "hello_paragraph_nested_in_table.pdf",
-                sourceFolder + "cmp_hello_paragraph_nested_in_table.pdf", destinationFolder, "diff03_");
+        convertToPdfAndCompare("hello_paragraph_nested_in_table", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
     public void helloParagraphWithSpansDocumentTest() throws IOException, InterruptedException {
-        convertAndCompare(sourceFolder + "hello_paragraph_with_span.html", destinationFolder + "hello_paragraph_with_span.pdf",
-                sourceFolder + "cmp_hello_paragraph_with_span.pdf", destinationFolder, "diff03_");
+        convertToPdfAndCompare("hello_paragraph_with_span", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
     public void helloDivDocumentTest() throws IOException, InterruptedException {
-        convertAndCompare(sourceFolder + "hello_div.html", destinationFolder + "hello_div.pdf",
-                sourceFolder + "cmp_hello_div.pdf", destinationFolder, "diff03_");
+        convertToPdfAndCompare("hello_div", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
     public void aBlockInPTagTest() throws IOException, InterruptedException {
-        convertAndCompare(sourceFolder + "aBlockInPTag.html", destinationFolder + "aBlockInPTag.pdf",
-                sourceFolder + "cmp_aBlockInPTag.pdf", destinationFolder, "diff03_");
+        convertToPdfAndCompare("aBlockInPTag", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
     public void base64svgTest() throws IOException, InterruptedException {
-        HtmlConverter.convertToPdf(new File(sourceFolder + "objectTag_base64svg.html"), new File(destinationFolder + "objectTag_base64svg.pdf"));
-        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "objectTag_base64svg.pdf", sourceFolder + "cmp_objectTag_base64svg.pdf", destinationFolder, "diff01_"));
+        convertToPdfAndCompare("objectTag_base64svg", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, count = 1),
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate =
+                    StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, count = 1),
             @LogMessage(messageTemplate = Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER, count = 1)})
     public void htmlObjectIncorrectBase64Test() throws IOException, InterruptedException {
-        HtmlConverter.convertToPdf(new File(sourceFolder + "objectTag_incorrectBase64svg.html"), new File(destinationFolder + "objectTag_incorrectBase64svg.pdf"));
-        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "objectTag_incorrectBase64svg.pdf", sourceFolder + "cmp_objectTag_incorrectBase64svg.pdf", destinationFolder, "diff01_"));
-
+        convertToPdfAndCompare("objectTag_incorrectBase64svg", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_IT_S_TEXT_CONTENT, count = 1),
+    //TODO: update after DEVSIX-1346
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_IT_S_TEXT_CONTENT,
+                    count = 1),
             @LogMessage(messageTemplate = Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER, count = 2),
     })
     public void htmlObjectAltTextTest() throws IOException, InterruptedException {
-        //update after DEVSIX-1346
-        HtmlConverter.convertToPdf(new File(sourceFolder + "objectTag_altText.html"), new File(destinationFolder + "objectTag_altText.pdf"));
-        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "objectTag_altText.pdf", sourceFolder + "cmp_objectTag_altText.pdf", destinationFolder, "diff01_"));
-
+        convertToPdfAndCompare("objectTag_altText", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER, count = 1),})
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER,
+                    count = 1),})
     public void htmlObjectNestedObjectTest() throws IOException, InterruptedException {
-        HtmlConverter.convertToPdf(new File(sourceFolder + "objectTag_nestedTag.html"), new File(destinationFolder + "objectTag_nestedTag.pdf"));
-        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "objectTag_nestedTag.pdf", sourceFolder + "cmp_objectTag_nestedTag.pdf", destinationFolder, "diff01_"));
+        convertToPdfAndCompare("objectTag_nestedTag", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
-    @LogMessages(ignore = true, messages = {
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.RULE_IS_NOT_SUPPORTED),
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.CSS_PROPERTY_IN_PERCENTS_NOT_SUPPORTED),
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.PADDING_VALUE_IN_PERCENT_NOT_SUPPORTED),
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.MARGIN_VALUE_IN_PERCENT_NOT_SUPPORTED),
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.ERROR_PARSING_CSS_SELECTOR),
-            @LogMessage(messageTemplate = IoLogMessageConstant.WIDOWS_CONSTRAINT_VIOLATED),
-    })
-    public void batchConversionTest() throws IOException, InterruptedException {
-        ConverterProperties properties = new ConverterProperties().setBaseUri(sourceFolder)
-                .setMediaDeviceDescription(new MediaDeviceDescription(MediaType.PRINT));
-        FontProvider fontProvider = new DefaultFontProvider(true, false, false);
-        fontProvider.addDirectory(sourceFolder + "fonts/");
-        properties.setFontProvider(fontProvider);
-        IHtmlProcessor processor = new DefaultHtmlProcessor(properties);
-
-        IXmlParser parser = new JsoupHtmlParser();
-        String outPdfPath = destinationFolder + "smashing1.pdf";
-        PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outPdfPath));
-        IDocumentNode doc = parser.parse(new FileInputStream(sourceFolder + "smashing01.html"),
-                properties.getCharset());
-        Document document = processor.processDocument(doc, pdfDocument);
-        document.close();
-
-        Assert.assertNull(new CompareTool().compareByContent(outPdfPath,
-                sourceFolder + "cmp_smashing1.pdf", destinationFolder, "diff01_"));
-    }
-
-    @Test
-    public  void htmlImgBase64SVGTest() throws IOException, InterruptedException {
-        HtmlConverter.convertToPdf(new File(sourceFolder + "imgTag_base64svg.html"), new File(destinationFolder + "imgTag_base64svg.pdf"));
-        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "imgTag_base64svg.pdf", sourceFolder + "cmp_imgTag_base64svg.pdf", destinationFolder, "diff01_"));
-    }
-
-    private void convertAndCompare(String srcFilename, String outFilename, String cmpFilename, String outFolder, String diff) throws IOException, InterruptedException {
-        HtmlConverter.convertToPdf(new File(srcFilename), new File(outFilename));
-        System.out.println("html: " + UrlUtil.getNormalizedFileUriString(srcFilename) + "\n");
-        Assert.assertNull(new CompareTool().compareByContent(outFilename, cmpFilename, outFolder, diff));
+    public void htmlImgBase64SVGTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("imgTag_base64svg", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 }