Merge pull request #483 from rototor/testcase-for-#482

danfickle · web-flow · commit f82c54b910c6 · 2020-05-18T21:04:21.000+10:00
Fixes #482: Testcase And fix for the endless loop because of soft hyphen on empty line.
diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/Breaker.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/Breaker.java
@@ -173,6 +173,14 @@ public static LineBreakResult breakText(LayoutContext c,
                         context.setEnd(savedEnd);
                         continue LOOP;
                     } else {
+						if (context.getWidth() == 0) {
+							String calculatedSubstring = context.getCalculatedSubstring();
+							if (calculatedSubstring.chars().allMatch(ch -> ch == SOFT_HYPHEN)) {
+								// Consists only of soft hypen, we have to break here and skip all togheter. We do not
+                                // need to try breaking on the charater level, this will not work.
+								tryToBreakAnywhere = true;
+							}
+						}
                         // Else, retry it on a new line.
                         context.setEnd(savedEnd);
                         break LOOP;
diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/InlineBoxing.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/InlineBoxing.java
@@ -373,6 +373,7 @@ private static void startNewInlineLine(LayoutContext c, BlockBox box, int breakA
      * layout box.
      * Otherwise, if there are floats and the current line is otherwise empty, moves below float and trys again.
      * Otherwise, trys again on a new line.
+     * @return true if the line is finished, false if we must continue
      */
     private static boolean startInlineText(
             LayoutContext c, LineBreakContext lbContext, InlineBox inlineBox,
diff --git a/openhtmltopdf-examples/src/main/java/com/openhtmltopdf/testcases/TestcaseRunner.java b/openhtmltopdf-examples/src/main/java/com/openhtmltopdf/testcases/TestcaseRunner.java
@@ -51,6 +51,8 @@ public class TestcaseRunner {
 	 */
 	public static void main(String[] args) throws Exception {
 
+		runTestCase("soft-hypen-oom");
+
 		/*
 		 * Note: The RepeatedTableSample optionally requires the font file
 		 * NotoSans-Regular.ttf to be placed in the resources directory.
diff --git a/openhtmltopdf-examples/src/main/resources/testcases/soft-hypen-oom.html b/openhtmltopdf-examples/src/main/resources/testcases/soft-hypen-oom.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+	<style>
+		* {
+			margin: 0;
+			padding: 0;
+		}
+
+		.content {
+			word-wrap: break-word;
+			white-space:pre-wrap;
+		}
+	</style>
+</head>
+<body>
+<table class="content">
+	<tr>
+		<td>­</td>
+	</tr>
+	<tr>
+		<td>­­</td>
+	</tr>
+	<tr>
+		<td>­­­</td>
+	</tr>
+</table>
+<table class="content">
+	<tr>
+		<td> ­</td>
+	</tr>
+	<tr>
+		<td>­ ­</td>
+	</tr>
+	<tr>
+		<td>­ ­ ­</td>
+	</tr>
+</table>
+</body>
+</html>
