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

DEVSIX-1192

Author: LodrKumquat

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

@@ -1694,15 +1694,15 @@ LastFittingChildRendererData getIndexAndLayoutResultOfTheLastTextRendererWithNoS
                     }
                     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.get(lastAnalyzedTextRenderer));

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

@@ -134,7 +134,7 @@ public class TextRenderer extends AbstractRenderer implements ILeafElementRender
 
     private int specialScriptFirstNotFittingIndex = -1;
 
-    private boolean layoutUntilTheLastPossibleBreak = false;
+    private int firstIndexExceedingAvailableWidth = -1;
 
     /**
      * Creates a TextRenderer from its corresponding layout object.
@@ -343,8 +343,10 @@ public LayoutResult layout(LayoutContext layoutContext) {
                             && RenderingMode.HTML_MODE == 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;
                         } else {
@@ -434,8 +436,9 @@ && findPossibleBreaksSplitPosition(specialScriptsWordBreakPoints,
                 }
                 if (ind + 1 == text.end
                         || endOfNonBreakablePartCausedBySplitCharacter
-                        || endOfWordBelongingToSpecialScripts) {
-                    if (ind + 1 == text.end && layoutUntilTheLastPossibleBreak
+                        || endOfWordBelongingToSpecialScripts
+                        || (ind + 1 >= firstIndexExceedingAvailableWidth && firstIndexExceedingAvailableWidth != -1)) {
+                    if (ind + 1 >= firstIndexExceedingAvailableWidth && firstIndexExceedingAvailableWidth != -1
                             && !endOfNonBreakablePartCausedBySplitCharacter) {
                         firstCharacterWhichExceedsAllowedWidth = currentTextPos;
                     }
@@ -493,7 +496,7 @@ && findPossibleBreaksSplitPosition(specialScriptsWordBreakPoints,
                     boolean wordSplit = false;
                     boolean 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));
                             if (wordBounds != null) {
@@ -1303,8 +1306,8 @@ int getSpecialScriptFirstNotFittingIndex() {
         return specialScriptFirstNotFittingIndex;
     }
 
-    void setLayoutUntilTheLastPossibleBreak(boolean layoutUntilTheLastPossibleBreak) {
-        this.layoutUntilTheLastPossibleBreak = layoutUntilTheLastPossibleBreak;
+    void setFirstIndexExceedingAvailableWidth(int firstIndexExceedingAvailableWidth) {
+        this.firstIndexExceedingAvailableWidth = firstIndexExceedingAvailableWidth;
     }
 
     @Override