Process margins applied on text renderers.

DEVSIX-1552

Author: ars18wrw

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

@@ -180,6 +180,9 @@ public LayoutResult layout(LayoutContext layoutContext) {
         Border[] borders = getBorders();
         applyBorderBox(layoutBox, borders, false);
 
+        float[] paddings = getPaddings();
+        applyPaddings(layoutBox, paddings, false);
+
         MinMaxWidth countedMinMaxWidth = new MinMaxWidth(area.getBBox().getWidth() - layoutBox.getWidth(), area.getBBox().getWidth());
         AbstractWidthHandler widthHandler = new MaxSumWidthHandler(countedMinMaxWidth);
 
@@ -347,6 +350,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
             } else {
                 // check if line height exceeds the allowed height
                 if (Math.max(currentLineHeight, nonBreakablePartMaxHeight) > layoutBox.getHeight() && (null == overflowY || OverflowPropertyValue.FIT.equals(overflowY))) {
+                    applyPaddings(occupiedArea.getBBox(), paddings, true);
                     applyBorderBox(occupiedArea.getBBox(), borders, true);
                     applyMargins(occupiedArea.getBBox(), margins, true);
                     // Force to place what we can
@@ -442,6 +446,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
         boolean isPlacingForcedWhileNothing = false;
         if (currentLineHeight > layoutBox.getHeight()) {
             if (!Boolean.TRUE.equals(getPropertyAsBoolean(Property.FORCED_PLACEMENT)) && (null == overflowY || OverflowPropertyValue.FIT.equals(overflowY))) {
+                applyPaddings(occupiedArea.getBBox(), paddings, true);
                 applyBorderBox(occupiedArea.getBBox(), borders, true);
                 applyMargins(occupiedArea.getBBox(), margins, true);
                 return new TextLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this);
@@ -459,6 +464,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
         layoutBox.setHeight(area.getBBox().getHeight() - currentLineHeight);
 
         occupiedArea.getBBox().setWidth(occupiedArea.getBBox().getWidth() + italicSkewAddition + boldSimulationAddition);
+        applyPaddings(occupiedArea.getBBox(), paddings, true);
         applyBorderBox(occupiedArea.getBBox(), borders, true);
         applyMargins(occupiedArea.getBBox(), margins, true);
 
@@ -594,6 +600,7 @@ public void draw(DrawContext drawContext) {
 
         applyMargins(occupiedArea.getBBox(), getMargins(), false);
         applyBorderBox(occupiedArea.getBBox(), false);
+        applyPaddings(occupiedArea.getBBox(), getPaddings(), false);
 
         boolean isRelativePosition = isRelativePosition();
         if (isRelativePosition) {
@@ -750,6 +757,7 @@ public boolean accept(Glyph glyph) {
             applyRelativePositioningTranslation(false);
         }
 
+        applyPaddings(occupiedArea.getBBox(), true);
         applyBorderBox(occupiedArea.getBBox(), true);
         applyMargins(occupiedArea.getBBox(), getMargins(), true);
 
@@ -1142,7 +1150,7 @@ protected boolean resolveFonts(List<IRenderer> addTo) {
             FontSelectorStrategy strategy = provider.getStrategy(strToBeConverted,
                     FontFamilySplitter.splitFontFamily((String) font), fc, fontSet);
             // process empty renderers because they can have borders or paddings with background to be drawn
-            if (null != strToBeConverted && strToBeConverted.isEmpty()) {
+            if (null == strToBeConverted || strToBeConverted.isEmpty()) {
                 addTo.add(this);
             } else {
                 while (!strategy.endOfText()) {