Merge branch 'feature/inline_blocks_support_and_leading_improvements' into develop

Author: Snipx

io/src/main/java/com/itextpdf/io/LogMessageConstant.java

@@ -76,6 +76,7 @@ public final class LogMessageConstant {
     public static final String IMAGE_HAS_JPXDECODE_FILTER = "Image cannot be inline if it has JPXDecode filter. It will be added as an ImageXObject";
     public static final String IMAGE_SIZE_CANNOT_BE_MORE_4KB = "Inline image size cannot be more than 4KB. It will be added as an ImageXObject";
     public static final String INCORRECT_PAGEROTATION = "Encounterd a page rotation that was not a multiple of 90°/ (Pi/2) when generating default appearances for form fields";
+    public static final String INLINE_BLOCK_ELEMENT_WILL_BE_CLIPPED = "Inline block element does not fit into parent element and will be clipped";
     public static final String INPUT_STREAM_CONTENT_IS_LOST_ON_PDFSTREAM_SERIALIZATION = "PdfStream contains not null input stream. It's content will be lost in serialized object.";
     public static final String INVALID_INDIRECT_REFERENCE = "Invalid indirect reference {0} {1} R";
     public static final String INVALID_KEY_VALUE_KEY_0_HAS_NULL_VALUE = "Invalid key value: key {0} has null value.";

layout/src/main/java/com/itextpdf/layout/element/Paragraph.java

@@ -106,6 +106,11 @@ public Paragraph add(ILeafElement element) {
         return this;
     }
 
+    public Paragraph add(IBlockElement element) {
+        childElements.add(element);
+        return this;
+    }
+
     /**
      * Adds a {@link java.util.List} of layout elements to the Paragraph.
      * @param elements the content to be added, any {@link ILeafElement}

layout/src/main/java/com/itextpdf/layout/margincollapse/MarginsCollapseHandler.java

@@ -46,9 +46,11 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.IPropertyContainer;
 import com.itextpdf.layout.property.FloatPropertyValue;
 import com.itextpdf.layout.property.Property;
+import com.itextpdf.layout.renderer.AbstractRenderer;
 import com.itextpdf.layout.renderer.BlockRenderer;
 import com.itextpdf.layout.renderer.CellRenderer;
 import com.itextpdf.layout.renderer.IRenderer;
+import com.itextpdf.layout.renderer.LineRenderer;
 import com.itextpdf.layout.renderer.RootRenderer;
 import com.itextpdf.layout.renderer.TableRenderer;
 
@@ -473,7 +475,9 @@ private static boolean marginsCouldBeSelfCollapsing(IRenderer renderer) {
         return !(renderer instanceof TableRenderer)
                 && !rendererIsFloated(renderer)
                 && !hasBottomBorders(renderer) && !hasTopBorders(renderer)
-                && !hasBottomPadding(renderer) && !hasTopPadding(renderer) && !hasPositiveHeight(renderer);
+                && !hasBottomPadding(renderer) && !hasTopPadding(renderer) && !hasPositiveHeight(renderer)
+                // inline block
+                && !(isBlockElement(renderer) && renderer instanceof AbstractRenderer && ((AbstractRenderer) renderer).getParent() instanceof LineRenderer);
     }
 
     private static boolean firstChildMarginAdjoinedToParent(IRenderer parent) {
@@ -486,7 +490,6 @@ private static boolean lastChildMarginAdjoinedToParent(IRenderer parent) {
                 && !rendererIsFloated(parent) && !hasBottomBorders(parent) && !hasBottomPadding(parent) && !hasHeightProp(parent);
     }
 
-
     private static boolean isBlockElement(IRenderer renderer) {
         return renderer instanceof BlockRenderer || renderer instanceof TableRenderer;
     }

layout/src/main/java/com/itextpdf/layout/renderer/AbstractRenderer.java

@@ -49,15 +49,20 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.geom.AffineTransform;
 import com.itextpdf.kernel.geom.Point;
 import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.*;
+import com.itextpdf.kernel.pdf.PdfArray;
+import com.itextpdf.kernel.pdf.PdfDictionary;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfName;
+import com.itextpdf.kernel.pdf.PdfNumber;
+import com.itextpdf.kernel.pdf.PdfObject;
+import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.action.PdfAction;
 import com.itextpdf.kernel.pdf.annot.PdfLinkAnnotation;
 import com.itextpdf.kernel.pdf.canvas.CanvasArtifact;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.kernel.pdf.extgstate.PdfExtGState;
 import com.itextpdf.kernel.pdf.tagging.PdfStructElem;
 import com.itextpdf.kernel.pdf.tagutils.IAccessibleElement;
-import com.itextpdf.layout.Document;
 import com.itextpdf.kernel.pdf.tagutils.TagTreePointer;
 import com.itextpdf.layout.IPropertyContainer;
 import com.itextpdf.layout.border.Border;
@@ -69,12 +74,22 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.layout.LayoutPosition;
 import com.itextpdf.layout.minmaxwidth.MinMaxWidth;
 import com.itextpdf.layout.minmaxwidth.MinMaxWidthUtils;
-import com.itextpdf.layout.property.*;
+import com.itextpdf.layout.property.Background;
+import com.itextpdf.layout.property.BackgroundImage;
+import com.itextpdf.layout.property.HorizontalAlignment;
+import com.itextpdf.layout.property.Property;
+import com.itextpdf.layout.property.TransparentColor;
+import com.itextpdf.layout.property.UnitValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Defines the most common properties and behavior that are shared by most
@@ -741,6 +756,19 @@ protected Float getFirstYLineRecursively() {
         return ((AbstractRenderer) childRenderers.get(0)).getFirstYLineRecursively();
     }
 
+    protected Float getLastYLineRecursively() {
+        for (int i = childRenderers.size() - 1; i >= 0; i--) {
+            IRenderer child = childRenderers.get(i);
+            if (child instanceof AbstractRenderer) {
+                Float lastYLine = ((AbstractRenderer) child).getLastYLineRecursively();
+                if (lastYLine != null) {
+                    return lastYLine;
+                }
+            }
+        }
+        return null;
+    }
+
     /**
      * Applies margins of the renderer on the given rectangle
      *