Apply object tag height and width during conversion

vitali.prudnikovich · vitali.prudnikovich · commit 90e9e37ac75e · 2022-10-14T15:40:11.000+03:00
diff --git a/src/main/java/com/itextpdf/html2pdf/css/resolve/HtmlStylesToCssConverter.java b/src/main/java/com/itextpdf/html2pdf/css/resolve/HtmlStylesToCssConverter.java
@@ -477,7 +477,7 @@ public boolean isSupportedForElement(String elementName) {
             return TagConstants.HR.equals(elementName) || TagConstants.IMG.equals(elementName)
                     || TagConstants.TABLE.equals(elementName) || TagConstants.TD.equals(elementName)
                     || TagConstants.TH.equals(elementName) || TagConstants.COLGROUP.equals(elementName)
-                    || TagConstants.COL.equals(elementName);
+                    || TagConstants.COL.equals(elementName) || TagConstants.OBJECT.equals(elementName);
         }
 
         /* (non-Javadoc)
@@ -504,7 +504,8 @@ private static class HeightAttributeConverter implements IAttributeConverter {
          */
         @Override
         public boolean isSupportedForElement(String elementName) {
-            return TagConstants.IMG.equals(elementName) || TagConstants.TD.equals(elementName);
+            return TagConstants.IMG.equals(elementName) || TagConstants.TD.equals(elementName)
+                    || TagConstants.OBJECT.equals(elementName);
         }
 
         /* (non-Javadoc)
diff --git a/src/test/java/com/itextpdf/html2pdf/css/resolve/HtmlStylesToCssConverterIntegrationTest.java b/src/test/java/com/itextpdf/html2pdf/css/resolve/HtmlStylesToCssConverterIntegrationTest.java
@@ -0,0 +1,28 @@
+package com.itextpdf.html2pdf.css.resolve;
+
+import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
+import com.itextpdf.test.annotations.type.IntegrationTest;
+
+import java.io.IOException;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(IntegrationTest.class)
+public class HtmlStylesToCssConverterIntegrationTest extends ExtendedHtmlConversionITextTest {
+
+    public static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/html2pdf/css"
+            + "/HtmlStylesToCssConverterIntegrationTest/";
+    public static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/html2pdf/css"
+            + "/HtmlStylesToCssConverterIntegrationTest/";
+
+    @BeforeClass
+    public static void beforeClass() {
+        createOrClearDestinationFolder(DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void objectTagWidthAndHeightTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("objectTagWidthAndHeightTest", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+}
diff --git a/src/test/resources/com/itextpdf/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/cmp_objectTagWidthAndHeightTest.pdf b/src/test/resources/com/itextpdf/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/cmp_objectTagWidthAndHeightTest.pdf
diff --git a/src/test/resources/com/itextpdf/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/external.svg b/src/test/resources/com/itextpdf/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/external.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 600" version="1.1">
+<path fill="red" stroke="blue" stroke-width="10"
+         d= "M 150,205  L179,291 L269,291 L197,345
+             L223,431 L150,380 L77,431 L103,345
+             L31,291 L121,291 z"/>
+<path fill="lime" stroke="blue" stroke-width="10"
+         d="M 400,205  L508,267.5 L508,392.5
+                    L400,455 L292,392.6 L292,267.5 z"/>
+</svg>
diff --git a/src/test/resources/com/itextpdf/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/objectTagWidthAndHeightTest.html b/src/test/resources/com/itextpdf/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/objectTagWidthAndHeightTest.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<p>External SVG image</p>
+<img lang="fr" src="external.svg"  alt="extérieur svg image" width="400" height="180"/>
+
+<p>
+	<object type="image/svg+xml" data="external.svg" lang="ru" width="400" height="180"></object>
+</p>
+</body>
+</html>
