Fix alignment bug when floats present

Text is laid out taking into account the float width, but the
alignment value for center, right, and justified ignore the float.

Autoported commit.
Original commit hash: [0bdcb54c5]

Author: rjcohn

itext.tests/itext.layout.tests/itext/layout/AlignmentTest.cs

@@ -46,6 +46,7 @@ source product.
 using iText.IO.Util;
 using iText.Kernel.Colors;
 using iText.Kernel.Font;
+using iText.Kernel.Geom;
 using iText.Kernel.Pdf;
 using iText.Kernel.Pdf.Xobject;
 using iText.Kernel.Utils;
@@ -269,5 +270,42 @@ public virtual void ImageAlignmentTest01() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
                 , "diff"));
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void FloatAlignmentTest01() {
+            String outFileName = destinationFolder + "floatAlignmentTest01.pdf";
+            String cmpFileName = sourceFolder + "cmp_floatAlignmentTest01.pdf";
+            PdfWriter writer = new PdfWriter(outFileName);
+            PdfDocument pdfDoc = new PdfDocument(writer);
+            pdfDoc.SetDefaultPageSize(new PageSize(350, 450));
+            Document doc = new Document(pdfDoc);
+            AddFloatAndText(doc, FloatPropertyValue.RIGHT);
+            AddFloatAndText(doc, FloatPropertyValue.LEFT);
+            doc.Add(new AreaBreak());
+            doc.Add(new Paragraph("All lines after this one have first line indent = 20. " + "Float left is correct, right is not."
+                ));
+            doc.SetProperty(Property.FIRST_LINE_INDENT, 20f);
+            AddFloatAndText(doc, FloatPropertyValue.RIGHT);
+            // Alignment is incorrect because indent is replaced by float adjustment
+            AddFloatAndText(doc, FloatPropertyValue.LEFT);
+            doc.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
+                , "diff"));
+        }
+
+        private static void AddFloatAndText(Document doc, FloatPropertyValue? floatPropertyValue) {
+            Div div = new Div();
+            div.SetWidth(150).SetHeight(120);
+            div.SetProperty(Property.FLOAT, floatPropertyValue);
+            div.SetBorder(new SolidBorder(1));
+            doc.Add(div);
+            doc.Add(new Paragraph("Left aligned.").SetTextAlignment(TextAlignment.LEFT));
+            doc.Add(new Paragraph("Right aligned.").SetTextAlignment(TextAlignment.RIGHT));
+            doc.Add(new Paragraph("Center aligned.").SetTextAlignment(TextAlignment.CENTER));
+            doc.Add(new Paragraph("Justified. " + "The text is laid out using the correct width, but  the alignment value uses the full width."
+                ).SetTextAlignment(TextAlignment.JUSTIFIED));
+        }
     }
 }

itext.tests/itext.layout.tests/resources/itext/layout/AlignmentTest/cmp_floatAlignmentTest01.pdf

@@ -200,12 +200,20 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                 if (result.GetStatus() == LayoutResult.PARTIAL && textAlignment == TextAlignment.JUSTIFIED && !result.IsSplitForcedByNewline
                     () || textAlignment == TextAlignment.JUSTIFIED_ALL) {
                     if (processedRenderer != null) {
-                        processedRenderer.Justify(layoutBox.GetWidth() - lineIndent);
+                        //processedRenderer.justify(layoutBox.getWidth() - lineIndent);
+                        //7.0.5 fix: processedRenderer.justify(result.getMinMaxWidth().getAvailableWidth() - lineIndent);
+                        Rectangle floatBox = layoutBox.Clone();
+                        FloatingHelper.AdjustLineAreaAccordingToFloats(floatRendererAreas, floatBox);
+                        processedRenderer.Justify(floatBox.GetWidth() - lineIndent);
                     }
                 }
                 else {
                     if (textAlignment != TextAlignment.LEFT && processedRenderer != null) {
-                        float deltaX = childBBoxWidth - processedRenderer.GetOccupiedArea().GetBBox().GetWidth();
+                        //float deltaX = childBBoxWidth - processedRenderer.getOccupiedArea().getBBox().getWidth();
+                        //7.0.5 fix: float deltaX = result.getMinMaxWidth().getAvailableWidth() - processedRenderer.getOccupiedArea().getBBox().getWidth();
+                        Rectangle floatBox = layoutBox.Clone();
+                        FloatingHelper.AdjustLineAreaAccordingToFloats(floatRendererAreas, floatBox);
+                        float deltaX = floatBox.GetWidth() - lineIndent - processedRenderer.GetOccupiedArea().GetBBox().GetWidth();
                         switch (textAlignment) {
                             case TextAlignment.RIGHT: {
                                 processedRenderer.Move(deltaX, 0);

itext/itext.layout/itext/layout/renderer/ParagraphRenderer.cs

@@ -1 +1 @@
-899d2966ee00f8d2a6014855ad65136e29b54e39
+0bdcb54c5ec72e3c5865fe0a56a29f1cbccff83f