Merge branch 'float_splitting' into develop

# Conflicts:
#	src/test/java/com/itextpdf/html2pdf/css/FloatTest.java
#	src/test/java/com/itextpdf/html2pdf/css/media/print/SmashingTest.java
#	src/test/resources/com/itextpdf/html2pdf/css/FloatTest/cmp_float48Test.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/FloatTest/cmp_float55Test.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/FloatTest/cmp_responsiveIText.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/FloatTest/cmp_responsiveIText_315.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/FloatTest/cmp_responsiveIText_570.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/FloatTest/float55Test.html
#	src/test/resources/com/itextpdf/html2pdf/css/bootstrap/Bootstrap3.3.7/examples/forms/cmp_formsTablets.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/bootstrap/Bootstrap3.3.7/examples/glyphicon/cmp_glyphiconDesktops.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/bootstrap/Bootstrap3.3.7/examples/glyphicon/cmp_glyphiconLargeDesktops.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/bootstrap/Bootstrap3.3.7/examples/glyphicon/cmp_glyphiconPhones.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/bootstrap/Bootstrap3.3.7/examples/glyphicon/cmp_glyphiconTablets.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/media/print/WashingtonPostTest/cmp_trump.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/media/print/WikiTest/cmp_css.big.wiki_simplified.pdf
#	src/test/resources/com/itextpdf/html2pdf/css/media/print/WikiTest/cmp_rock.wiki_simplified.pdf
#	src/test/resources/com/itextpdf/html2pdf/custom/divInTable001/cmp_divInTable001.pdf

Author: yulian-gaponenko

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/HtmlDocumentRenderer.java

@@ -170,7 +170,9 @@ public void addChild(IRenderer renderer) {
     @Override
     public void close() {
         if (waitingElement != null) {
-            super.addChild(waitingElement);
+            IRenderer r = this.waitingElement;
+            waitingElement = null;
+            super.addChild(r);
         }
         super.close();
         if (TRIM_LAST_BLANK_PAGE) {

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/AbstractFormFieldRenderer.java

@@ -51,13 +51,10 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.layout.LayoutResult;
 import com.itextpdf.layout.layout.MinMaxWidthLayoutResult;
 import com.itextpdf.layout.minmaxwidth.MinMaxWidth;
+import com.itextpdf.layout.property.FloatPropertyValue;
 import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.property.UnitValue;
-import com.itextpdf.layout.renderer.AbstractRenderer;
-import com.itextpdf.layout.renderer.BlockRenderer;
-import com.itextpdf.layout.renderer.DrawContext;
-import com.itextpdf.layout.renderer.ILeafElementRenderer;
-import com.itextpdf.layout.renderer.IRenderer;
+import com.itextpdf.layout.renderer.*;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -233,7 +230,22 @@ private LayoutResult layout(LayoutContext layoutContext, boolean minMaxWidth) {
         }
 
         if (!Boolean.TRUE.equals(getPropertyAsBoolean(Property.FORCED_PLACEMENT)) && (result.getStatus() != LayoutResult.FULL)) {
-            setProperty(Property.FORCED_PLACEMENT, true);
+            //@TODO investigate this tricky code a little more.
+            FloatPropertyValue floatPropertyValue = this.<FloatPropertyValue>getProperty(Property.FLOAT);
+            if (floatPropertyValue == null || floatPropertyValue == FloatPropertyValue.NONE) {
+                setProperty(Property.FORCED_PLACEMENT, true);
+            } else {
+                flatRenderer = childRenderers.get(0);
+                childRenderers.clear();
+                LayoutArea flatRendererOccupiedArea = flatRenderer.getOccupiedArea();
+                applyPaddings(flatRendererOccupiedArea.getBBox(), true);
+                applyBorderBox(flatRendererOccupiedArea.getBBox(), true);
+                applyMargins(flatRendererOccupiedArea.getBBox(), true);
+                childRenderers.add(flatRenderer);
+                adjustFieldLayout();
+                occupiedArea.setBBox(flatRenderer.getOccupiedArea().getBBox().clone());
+            }
+
             return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this).setMinMaxWidth(new MinMaxWidth(0, parentWidth));
         }
         if (!childRenderers.isEmpty()) {
@@ -265,5 +277,4 @@ private LayoutResult layout(LayoutContext layoutContext, boolean minMaxWidth) {
         return new MinMaxWidthLayoutResult(LayoutResult.FULL, occupiedArea, this, null)
                 .setMinMaxWidth(new MinMaxWidth(0, parentWidth, occupiedArea.getBBox().getWidth(), occupiedArea.getBBox().getWidth()));
     }
-
 }

src/test/java/com/itextpdf/html2pdf/css/FloatTest.java

@@ -52,6 +52,8 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.utils.CompareTool;
 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.File;
@@ -364,6 +366,29 @@ public void float55Test() throws IOException, InterruptedException {
         runTest("float55Test", "diff55_");
     }
 
+    @Test
+    public void float57Test() throws IOException, InterruptedException {
+        runTest("float57Test", "diff57_");
+    }
+
+    @Test@Ignore("DEVSIX-1372")
+    public void float58Test() throws IOException, InterruptedException {
+        runTest("float58Test", "diff58_");
+    }
+
+    @Test
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count = 1),
+    })
+    public void float60Test() throws IOException, InterruptedException {
+        runTest("float60Test", "diff60_");
+    }
+
+    @Test
+    public void float61Test() throws IOException, InterruptedException {
+        runTest("float61Test", "diff61_");
+    }
+
     @Test
     public void floatAndTables01Test() throws IOException, InterruptedException {
         runTest("floatAndTables01Test", "diffTables01_");
@@ -414,164 +439,18 @@ public void floatAndTables10Test() throws IOException, InterruptedException {
         runTest("floatAndTables10Test", "diffTables10_");
     }
 
-    @Test
-    public void floatImage01Test() throws IOException, InterruptedException {
-        runTest("floatImage01Test", "diffImages01_");
-    }
-
-    @Test
-    public void floatImage02Test() throws IOException, InterruptedException {
-        runTest("floatImage02Test", "diffImages02_");
-    }
-
-    @Test
-    public void floatImage03Test() throws IOException, InterruptedException {
-        runTest("floatImage03Test", "diffImages03_");
-    }
-
-    @Test
-    public void floatImage04Test() throws IOException, InterruptedException {
-        // TODO word splitting logic working not entirely correctly
-        runTest("floatImage04Test", "diffImages04_");
-    }
-
-    @Test
-    public void floatImage05Test() throws IOException, InterruptedException {
-        runTest("floatImage05Test", "diffImages05_");
-    }
-
-    @Test
-    public void floatImage06Test() throws IOException, InterruptedException {
-        runTest("floatImage06Test", "diffImages06_");
-    }
-
-    @Test
-    public void floatImage07Test() throws IOException, InterruptedException {
-        // TODO word splitting logic working not entirely correctly
-        runTest("floatImage07Test", "diffImages07_");
-    }
-
-    @Test
-    public void floatImage08Test() throws IOException, InterruptedException {
-        runTest("floatImage08Test", "diffImages08_");
-    }
-
-    @Test
-    public void floatImage09Test() throws IOException, InterruptedException {
-        runTest("floatImage09Test", "diffImages09_");
-    }
-
-    @Test
-    public void floatImage10Test() throws IOException, InterruptedException {
-        // TODO we don't apply leading on floats, this somewhat noticeable when huge line-height in html is used
-        runTest("floatImage10Test", "diffImages10_");
-    }
-
-    @Test
-    public void floatImage11Test() throws IOException, InterruptedException {
-        runTest("floatImage11Test", "diffImages11_");
-    }
-
-    @Test
-    public void floatImage12Test() throws IOException, InterruptedException {
-        // TODO we don't apply leading on floats, this somewhat noticeable when huge line-height in html is used
-        runTest("floatImage12Test", "diffImages12_");
-    }
-
-    @Test
-    public void floatImage13Test() throws IOException, InterruptedException {
-        // TODO we don't apply leading on floats, this somewhat noticeable when huge line-height in html is used
-        runTest("floatImage13Test", "diffImages13_");
-    }
-
     @Test
     @Ignore("DEVSIX-1316")
     public void floatImage14Test() throws IOException, InterruptedException {
         runTest("floatImage14Test", "diffImages14_");
     }
 
-    @Test
-    public void floatInline01Test() throws IOException, InterruptedException {
-        runTest("floatInline01Test", "diffImages01_");
-    }
-
-    @Test
-    public void floatInline02Test() throws IOException, InterruptedException {
-        runTest("floatInline02Test", "diffImages02_");
-    }
-
-    @Test
-    public void floatInline03Test() throws IOException, InterruptedException {
-        runTest("floatInline03Test", "diffImages03_");
-    }
-
-    @Test
-    public void floatInline04Test() throws IOException, InterruptedException {
-        runTest("floatInline04Test", "diffImages04_");
-    }
-
-    @Test
-    public void floatInline05Test() throws IOException, InterruptedException {
-        runTest("floatInline05Test", "diffImages05_");
-    }
-
-    @Test
-    public void floatInline06Test() throws IOException, InterruptedException {
-        runTest("floatInline06Test", "diffImages06_");
-    }
-
-    @Test
-    public void floatInline07Test() throws IOException, InterruptedException {
-        runTest("floatInline07Test", "diffImages07_");
-    }
-
-    @Test
-    public void floatInline08Test() throws IOException, InterruptedException {
-        runTest("floatInline08Test", "diffImages08_");
-    }
-
     @Test
     public void floatInline09Test() throws IOException, InterruptedException {
         // TODO DEVSIX-1269
         runTest("floatInline09Test", "diffImages09_");
     }
 
-    @Test
-    public void floatInline10Test() throws IOException, InterruptedException {
-        runTest("floatInline10Test", "diffImages10_");
-    }
-
-    @Test
-    public void floatInline11Test() throws IOException, InterruptedException {
-        runTest("floatInline11Test", "diffImages11_");
-    }
-
-    @Test
-    public void floatInline12Test() throws IOException, InterruptedException {
-        runTest("floatInline12Test", "diffImages12_");
-    }
-
-    @Test
-    public void floatInline13Test() throws IOException, InterruptedException {
-        runTest("floatInline13Test", "diffImages13_");
-    }
-
-    @Test
-    public void floatInline14Test() throws IOException, InterruptedException {
-        runTest("floatInline14Test", "diffImages14_");
-    }
-
-    @Test
-    public void floatInline15Test() throws IOException, InterruptedException {
-        // TODO another difference concerning nested spans processing
-        runTest("floatInline15Test", "diffImages15_");
-    }
-
-    @Test
-    public void floatInline16Test() throws IOException, InterruptedException {
-        runTest("floatInline16Test", "diffImages16_");
-    }
-
     @Test
     public void floatInline17Test() throws IOException, InterruptedException {
         runTest("floatInline17Test", "diffImages17_");
@@ -587,9 +466,6 @@ private void runTest(String testName, String diff) throws IOException, Interrupt
 
     @Test
     public void responsiveIText() throws IOException, InterruptedException {
-        // TODO results to be reviewed after floating elements splitting support (DEVSIX-1267)
-        // Split floating element parent has zero height (and therefore border is not drawn around it),
-        // even though :after { clear: both} feature is applied in html.
         PageSize[] pageSizes = {
                 null,
                 new PageSize(PageSize.A3.getHeight(), PageSize.A4.getHeight()),