Do not reset the alignment for RTL elements if it's present.

ars18wrw · ars18wrw · commit 65e93d8901d6 · 2019-04-11T17:58:53.000+03:00
DEVSIX-2806
diff --git a/src/main/java/com/itextpdf/html2pdf/css/apply/util/FontStyleApplierUtil.java b/src/main/java/com/itextpdf/html2pdf/css/apply/util/FontStyleApplierUtil.java
@@ -137,7 +137,8 @@ public static void applyFontStyles(Map<String, String> cssProps, ProcessorContex
         }
 
         if (stylesContainer instanceof IElementNode && ((IElementNode) stylesContainer).parentNode() instanceof IElementNode &&
-                CssConstants.RTL.equals(((IElementNode) ((IElementNode) stylesContainer).parentNode()).getStyles().get(CssConstants.DIRECTION))) {
+                CssConstants.RTL.equals(((IElementNode) ((IElementNode) stylesContainer).parentNode()).getStyles().get(CssConstants.DIRECTION)) &&
+                !element.hasProperty(Property.HORIZONTAL_ALIGNMENT)) {
             // We should only apply horizontal alignment if parent has dir attribute or direction property
             element.setProperty(Property.HORIZONTAL_ALIGNMENT, HorizontalAlignment.RIGHT);
         }
diff --git a/src/test/java/com/itextpdf/html2pdf/element/ParagraphTest.java b/src/test/java/com/itextpdf/html2pdf/element/ParagraphTest.java
@@ -190,4 +190,10 @@ public void paragraphWithImageTest01() throws IOException, InterruptedException
         HtmlConverter.convertToPdf(new File(sourceFolder + "paragraphWithImageTest01.html"), new File(destinationFolder + "paragraphWithImageTest01.pdf"));
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "paragraphWithImageTest01.pdf", sourceFolder + "cmp_paragraphWithImageTest01.pdf", destinationFolder, "diff_paragraphWithImageTest01_"));
     }
+
+    @Test
+    public void paragraphWithImageTest01RTL() throws IOException, InterruptedException {
+        HtmlConverter.convertToPdf(new File(sourceFolder + "paragraphWithImageTest01RTL.html"), new File(destinationFolder + "paragraphWithImageTest01RTL.pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "paragraphWithImageTest01RTL.pdf", sourceFolder + "cmp_paragraphWithImageTest01RTL.pdf", destinationFolder, "diff_paragraphWithImageTest01_"));
+    }
 }
diff --git a/src/test/resources/com/itextpdf/html2pdf/element/ParagraphTest/cmp_paragraphWithImageTest01RTL.pdf b/src/test/resources/com/itextpdf/html2pdf/element/ParagraphTest/cmp_paragraphWithImageTest01RTL.pdf
diff --git a/src/test/resources/com/itextpdf/html2pdf/element/ParagraphTest/paragraphWithImageTest01RTL.html b/src/test/resources/com/itextpdf/html2pdf/element/ParagraphTest/paragraphWithImageTest01RTL.html
@@ -0,0 +1,6 @@
+<body dir="rtl">
+<p><img
+        style='display: block; margin-left: auto; margin-right: auto;' title='placeholder-170x70.jpg'
+        src='image.png' width='170'
+        height='70'/></p>
+</body>

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,8 @@ public static void applyFontStyles(Map<String, String> cssProps, ProcessorContex`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`if (stylesContainer instanceof IElementNode && ((IElementNode) stylesContainer).parentNode() instanceof IElementNode &&`
`140`		`- CssConstants.RTL.equals(((IElementNode) ((IElementNode) stylesContainer).parentNode()).getStyles().get(CssConstants.DIRECTION))) {`
	`140`	`+ CssConstants.RTL.equals(((IElementNode) ((IElementNode) stylesContainer).parentNode()).getStyles().get(CssConstants.DIRECTION)) &&`
	`141`	`+ !element.hasProperty(Property.HORIZONTAL_ALIGNMENT)) {`
`141`	`142`	`// We should only apply horizontal alignment if parent has dir attribute or direction property`
`142`	`143`	`element.setProperty(Property.HORIZONTAL_ALIGNMENT, HorizontalAlignment.RIGHT);`
`143`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,4 +190,10 @@ public void paragraphWithImageTest01() throws IOException, InterruptedException`
`190`	`190`	`HtmlConverter.convertToPdf(new File(sourceFolder + "paragraphWithImageTest01.html"), new File(destinationFolder + "paragraphWithImageTest01.pdf"));`
`191`	`191`	`Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "paragraphWithImageTest01.pdf", sourceFolder + "cmp_paragraphWithImageTest01.pdf", destinationFolder, "diff_paragraphWithImageTest01_"));`
`192`	`192`	`}`
	`193`	`+`
	`194`	`+ @Test`
	`195`	`+ public void paragraphWithImageTest01RTL() throws IOException, InterruptedException {`
	`196`	`+ HtmlConverter.convertToPdf(new File(sourceFolder + "paragraphWithImageTest01RTL.html"), new File(destinationFolder + "paragraphWithImageTest01RTL.pdf"));`
	`197`	`+ Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "paragraphWithImageTest01RTL.pdf", sourceFolder + "cmp_paragraphWithImageTest01RTL.pdf", destinationFolder, "diff_paragraphWithImageTest01_"));`
	`198`	`+ }`
`193`	`199`	`}`