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

ars18wrw · iText-CI · commit 5154fbcc7d61 · 2019-04-11T17:16:48.000+02:00
DEVSIX-2806

Autoported commit.
Original commit hash: [65e93d89]
diff --git a/itext.tests/itext.html2pdf.tests/itext/html2pdf/element/ParagraphTest.cs b/itext.tests/itext.html2pdf.tests/itext/html2pdf/element/ParagraphTest.cs
@@ -261,5 +261,16 @@ public virtual void ParagraphWithImageTest01() {
                 , sourceFolder + "cmp_paragraphWithImageTest01.pdf", destinationFolder, "diff_paragraphWithImageTest01_"
                 ));
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void ParagraphWithImageTest01RTL() {
+            HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "paragraphWithImageTest01RTL.html"), new FileInfo(destinationFolder
+                 + "paragraphWithImageTest01RTL.pdf"));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + "paragraphWithImageTest01RTL.pdf"
+                , sourceFolder + "cmp_paragraphWithImageTest01RTL.pdf", destinationFolder, "diff_paragraphWithImageTest01_"
+                ));
+        }
     }
 }
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/ParagraphTest/cmp_paragraphWithImageTest01RTL.pdf b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/ParagraphTest/cmp_paragraphWithImageTest01RTL.pdf
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/ParagraphTest/paragraphWithImageTest01RTL.html b/itext.tests/itext.html2pdf.tests/resources/itext/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>
diff --git a/itext/itext.html2pdf/itext/html2pdf/css/apply/util/FontStyleApplierUtil.cs b/itext/itext.html2pdf/itext/html2pdf/css/apply/util/FontStyleApplierUtil.cs
@@ -121,7 +121,7 @@ public static void ApplyFontStyles(IDictionary<String, String> cssProps, Process
             }
             if (stylesContainer is IElementNode && ((IElementNode)stylesContainer).ParentNode() is IElementNode && CssConstants
                 .RTL.Equals(((IElementNode)((IElementNode)stylesContainer).ParentNode()).GetStyles().Get(CssConstants.
-                DIRECTION))) {
+                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/port-hash b/port-hash
@@ -1 +1 @@
-55c40116085862a958782d9d94e070c88e27f2f6
+65e93d8901d6c0d24ee8f9992d1a71ceaf706946

Original file line number	Diff line number	Diff line change
`@@ -261,5 +261,16 @@ public virtual void ParagraphWithImageTest01() {`
`261`	`261`	`, sourceFolder + "cmp_paragraphWithImageTest01.pdf", destinationFolder, "diff_paragraphWithImageTest01_"`
`262`	`262`	`));`
`263`	`263`	`}`
	`264`	`+`
	`265`	`+ /// <exception cref="System.IO.IOException"/>`
	`266`	`+ /// <exception cref="System.Exception"/>`
	`267`	`+ [NUnit.Framework.Test]`
	`268`	`+ public virtual void ParagraphWithImageTest01RTL() {`
	`269`	`+ HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "paragraphWithImageTest01RTL.html"), new FileInfo(destinationFolder`
	`270`	`+ + "paragraphWithImageTest01RTL.pdf"));`
	`271`	`+ NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + "paragraphWithImageTest01RTL.pdf"`
	`272`	`+ , sourceFolder + "cmp_paragraphWithImageTest01RTL.pdf", destinationFolder, "diff_paragraphWithImageTest01_"`
	`273`	`+ ));`
	`274`	`+ }`
`264`	`275`	`}`
`265`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public static void ApplyFontStyles(IDictionary<String, String> cssProps, Process`
`121`	`121`	`}`
`122`	`122`	`if (stylesContainer is IElementNode && ((IElementNode)stylesContainer).ParentNode() is IElementNode && CssConstants`
`123`	`123`	`.RTL.Equals(((IElementNode)((IElementNode)stylesContainer).ParentNode()).GetStyles().Get(CssConstants.`
`124`		`- DIRECTION))) {`
	`124`	`+ DIRECTION)) && !element.HasProperty(Property.HORIZONTAL_ALIGNMENT)) {`
`125`	`125`	`// We should only apply horizontal alignment if parent has dir attribute or direction property`
`126`	`126`	`element.SetProperty(Property.HORIZONTAL_ALIGNMENT, HorizontalAlignment.RIGHT);`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-55c40116085862a958782d9d94e070c88e27f2f6`
	`1`	`+65e93d8901d6c0d24ee8f9992d1a71ceaf706946`