Change condition to stop TextRenderer#layout when a width limit is reached

DEVSIX-1192

Autoported commit.
Original commit hash: [2ad033498e]

Author: LodrKumquat

itext/itext.layout/itext/layout/renderer/LineRenderer.cs

@@ -1795,13 +1795,13 @@ internal virtual LineRenderer.LastFittingChildRendererData GetIndexAndLayoutResu
                                 break;
                             }
                             if (textLayoutResult.IsContainsPossibleBreak() && textLayoutResult.GetStatus() != LayoutResult.NOTHING) {
-                                textRenderer.SetLayoutUntilTheLastPossibleBreak(true);
+                                textRenderer.SetFirstIndexExceedingAvailableWidth(textRenderer.line.end);
                                 // todo ? relayout in original bBox rather than occupied on the first layout area
                                 LayoutArea layoutArea = textRenderer.GetOccupiedArea().Clone();
                                 layoutArea.GetBBox().IncreaseHeight(0.0001F).IncreaseWidth(0.0001F);
                                 LayoutResult newChildLayoutResult = textRenderer.Layout(new LayoutContext(layoutArea, wasParentsHeightClipped
                                     ));
-                                textRenderer.SetLayoutUntilTheLastPossibleBreak(false);
+                                textRenderer.SetFirstIndexExceedingAvailableWidth(-1);
                                 if (newChildLayoutResult.GetStatus() == LayoutResult.FULL) {
                                     lastAnalyzedTextLayoutResult = new TextLayoutResult(LayoutResult.NOTHING, null, null, childRenderers[lastAnalyzedTextRenderer
                                         ]);

itext/itext.layout/itext/layout/renderer/TextRenderer.cs

@@ -116,7 +116,7 @@ public class TextRenderer : AbstractRenderer, ILeafElementRenderer {
 
         private int specialScriptFirstNotFittingIndex = -1;
 
-        private bool layoutUntilTheLastPossibleBreak = false;
+        private int firstIndexExceedingAvailableWidth = -1;
 
         /// <summary>Creates a TextRenderer from its corresponding layout object.</summary>
         /// <param name="textElement">
@@ -303,8 +303,9 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                              == mode) {
                             containsPossibleBreak = true;
                         }
-                        if (ind + 1 == text.end || nextGlyphIsSpaceOrWhiteSpace) {
-                            if (ind + 1 == text.end && layoutUntilTheLastPossibleBreak) {
+                        if (ind + 1 == text.end || nextGlyphIsSpaceOrWhiteSpace || (ind + 1 >= firstIndexExceedingAvailableWidth &&
+                             firstIndexExceedingAvailableWidth != -1)) {
+                            if (ind + 1 >= firstIndexExceedingAvailableWidth && firstIndexExceedingAvailableWidth != -1) {
                                 firstCharacterWhichExceedsAllowedWidth = currentTextPos;
                                 break;
                             }
@@ -386,8 +387,8 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                         containsPossibleBreak = true;
                     }
                     if (ind + 1 == text.end || endOfNonBreakablePartCausedBySplitCharacter || endOfWordBelongingToSpecialScripts
-                        ) {
-                        if (ind + 1 == text.end && layoutUntilTheLastPossibleBreak && !endOfNonBreakablePartCausedBySplitCharacter
+                         || (ind + 1 >= firstIndexExceedingAvailableWidth && firstIndexExceedingAvailableWidth != -1)) {
+                        if (ind + 1 >= firstIndexExceedingAvailableWidth && firstIndexExceedingAvailableWidth != -1 && !endOfNonBreakablePartCausedBySplitCharacter
                             ) {
                             firstCharacterWhichExceedsAllowedWidth = currentTextPos;
                         }
@@ -440,7 +441,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                         // cannot fit a word as a whole
                         bool wordSplit = false;
                         bool hyphenationApplied = false;
-                        if (hyphenationConfig != null && !layoutUntilTheLastPossibleBreak) {
+                        if (hyphenationConfig != null && firstIndexExceedingAvailableWidth == -1) {
                             if (-1 == nonBreakingHyphenRelatedChunkStart) {
                                 int[] wordBounds = GetWordBoundsForHyphenation(text, currentTextPos, text.end, Math.Max(currentTextPos, firstCharacterWhichExceedsAllowedWidth
                                      - 1));
@@ -841,7 +842,7 @@ public override void Draw(DrawContext drawContext) {
                 if (horizontalScaling != null && horizontalScaling != 1) {
                     canvas.SetHorizontalScaling((float)horizontalScaling * 100);
                 }
-                GlyphLine.IGlyphLineFilter filter = new _IGlyphLineFilter_909();
+                GlyphLine.IGlyphLineFilter filter = new _IGlyphLineFilter_912();
                 bool appearanceStreamLayout = true.Equals(GetPropertyAsBoolean(Property.APPEARANCE_STREAM_LAYOUT));
                 if (GetReversedRanges() != null) {
                     bool writeReversedChars = !appearanceStreamLayout;
@@ -903,8 +904,8 @@ public override void Draw(DrawContext drawContext) {
             }
         }
 
-        private sealed class _IGlyphLineFilter_909 : GlyphLine.IGlyphLineFilter {
-            public _IGlyphLineFilter_909() {
+        private sealed class _IGlyphLineFilter_912 : GlyphLine.IGlyphLineFilter {
+            public _IGlyphLineFilter_912() {
             }
 
             public bool Accept(Glyph glyph) {
@@ -1250,8 +1251,8 @@ internal virtual int GetSpecialScriptFirstNotFittingIndex() {
             return specialScriptFirstNotFittingIndex;
         }
 
-        internal virtual void SetLayoutUntilTheLastPossibleBreak(bool layoutUntilTheLastPossibleBreak) {
-            this.layoutUntilTheLastPossibleBreak = layoutUntilTheLastPossibleBreak;
+        internal virtual void SetFirstIndexExceedingAvailableWidth(int firstIndexExceedingAvailableWidth) {
+            this.firstIndexExceedingAvailableWidth = firstIndexExceedingAvailableWidth;
         }
 
         protected internal override Rectangle GetBackgroundArea(Rectangle occupiedAreaWithMargins) {

port-hash

@@ -1 +1 @@
-331d41b5533e9497787a729455f3aa0e0696c741
+2ad033498ee9a34948862200a45799746231aa3a