Restore non-text inline elements more carefully

Snipx · itext-teamcity · commit 09d12a9a3935 · 2017-06-26T18:15:52.000+03:00
DEVSIX-1053

Autoported commit.
Original commit hash: [8a3dc56]
diff --git a/itext/itext.layout/itext/layout/renderer/LineRenderer.cs b/itext/itext.layout/itext/layout/renderer/LineRenderer.cs
@@ -529,8 +529,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                             TextRenderer newRenderer = new TextRenderer((TextRenderer)renderer).RemoveReversedRanges();
                             children.Add(newRenderer);
                             // Insert non-text renderers
-                            if ((pos == lineGlyphs.Count - 1 || lineGlyphs[pos + 1].renderer != renderer) && insertAfter.ContainsKey((
-                                TextRenderer)renderer)) {
+                            if (insertAfter.ContainsKey((TextRenderer)renderer)) {
                                 children.Add(insertAfter.Get((TextRenderer)renderer));
                                 insertAfter.JRemove((TextRenderer)renderer);
                             }
@@ -574,7 +573,12 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                             }
                             else {
                                 currentWidth = child.GetOccupiedArea().GetBBox().GetWidth();
-                                child.GetOccupiedArea().GetBBox().SetX(currentXPos);
+                                if (child is AbstractRenderer) {
+                                    child.Move(currentXPos - child.GetOccupiedArea().GetBBox().GetX(), 0);
+                                }
+                                else {
+                                    child.GetOccupiedArea().GetBBox().SetX(currentXPos);
+                                }
                             }
                             currentXPos += currentWidth;
                         }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-ad0c2810c07d676725a59a8ddc7f25c15d88017b
+8a3dc5646eacef9df7fe8f01d6836105069f135a

Original file line number	Diff line number	Diff line change
`@@ -529,8 +529,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {`
`529`	`529`	`TextRenderer newRenderer = new TextRenderer((TextRenderer)renderer).RemoveReversedRanges();`
`530`	`530`	`children.Add(newRenderer);`
`531`	`531`	`// Insert non-text renderers`
`532`		`- if ((pos == lineGlyphs.Count - 1 \|\| lineGlyphs[pos + 1].renderer != renderer) && insertAfter.ContainsKey((`
`533`		`- TextRenderer)renderer)) {`
	`532`	`+ if (insertAfter.ContainsKey((TextRenderer)renderer)) {`
`534`	`533`	`children.Add(insertAfter.Get((TextRenderer)renderer));`
`535`	`534`	`insertAfter.JRemove((TextRenderer)renderer);`
`536`	`535`	`}`
`@@ -574,7 +573,12 @@ public override LayoutResult Layout(LayoutContext layoutContext) {`
`574`	`573`	`}`
`575`	`574`	`else {`
`576`	`575`	`currentWidth = child.GetOccupiedArea().GetBBox().GetWidth();`
`577`		`- child.GetOccupiedArea().GetBBox().SetX(currentXPos);`
	`576`	`+ if (child is AbstractRenderer) {`
	`577`	`+ child.Move(currentXPos - child.GetOccupiedArea().GetBBox().GetX(), 0);`
	`578`	`+ }`
	`579`	`+ else {`
	`580`	`+ child.GetOccupiedArea().GetBBox().SetX(currentXPos);`
	`581`	`+ }`
`578`	`582`	`}`
`579`	`583`	`currentXPos += currentWidth;`
`580`	`584`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ad0c2810c07d676725a59a8ddc7f25c15d88017b`
	`1`	`+8a3dc5646eacef9df7fe8f01d6836105069f135a`