Consider word's prefix while splitting with hyphenation. Add some new tests.

DEVSIX-1937

Author: ars18wrw

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

@@ -378,7 +378,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
                                     String pre = hyph.getPreHyphenText(i);
                                     String pos = hyph.getPostHyphenText(i);
                                     float currentHyphenationChoicePreTextWidth =
-                                            getGlyphLineWidth(convertToGlyphLine(pre + hyphenationConfig.getHyphenSymbol()), fontSize, hScale, characterSpacing, wordSpacing);
+                                            getGlyphLineWidth(convertToGlyphLine(text.toUnicodeString(currentTextPos, wordBounds[0]) + pre + hyphenationConfig.getHyphenSymbol()), fontSize, hScale, characterSpacing, wordSpacing);
                                     if (currentLineWidth + currentHyphenationChoicePreTextWidth + italicSkewAddition + boldSimulationAddition <= layoutBox.getWidth()) {
                                         hyphenationApplied = true;
 

layout/src/test/java/com/itextpdf/layout/HyphenateLayoutTest.java

@@ -46,9 +46,12 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.layout.element.AreaBreak;
 import com.itextpdf.layout.element.Paragraph;
+import com.itextpdf.layout.element.Text;
 import com.itextpdf.layout.hyphenation.HyphenationConfig;
 import com.itextpdf.layout.hyphenation.Hyphenator;
+import com.itextpdf.layout.property.TextAlignment;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.type.IntegrationTest;
 import org.junit.Assert;
@@ -91,4 +94,61 @@ public void parenthesisTest01() throws Exception {
         Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder, "diff"));
     }
 
+    @Test
+    public void uriTest01() throws Exception {
+        String outFileName = destinationFolder + "uriTest01.pdf";
+        String cmpFileName = sourceFolder + "cmp_uriTest01.pdf";
+
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));
+        Document document = new Document(pdfDoc, new PageSize(140, 500));
+
+        Hyphenator hyphenator = new Hyphenator("en", "en", 3, 3);
+        HyphenationConfig hyphenationConfig = new HyphenationConfig(hyphenator);
+        document.setHyphenation(hyphenationConfig);
+
+        Paragraph p = new Paragraph("https://stackoverflow.com/");
+        document.add(p);
+        p = new Paragraph("http://stackoverflow.com/");
+        document.add(p);
+        p = new Paragraph("m://iiiiiiii.com/");
+        document.add(p);
+
+        document.add(new AreaBreak());
+
+        p = new Paragraph("https://stackoverflow.com/");
+        p.setHyphenation(null);
+        document.add(p);
+        p = new Paragraph("http://stackoverflow.com/");
+        p.setHyphenation(null);
+        document.add(p);
+        p = new Paragraph("m://iiiiiiii.com/");
+        p.setHyphenation(null);
+        document.add(p);
+
+        document.close();
+
+        Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder, "diff"));
+    }
+
+    @Test
+    public void widthTest01() throws Exception {
+        String outFileName = destinationFolder + "widthTest01.pdf";
+        String cmpFileName = sourceFolder + "cmp_widthTest01.pdf";
+
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));
+        Document doc = new Document(pdfDoc);
+
+        Text text = new Text("Hier ein link https://stackoverflow " + "\n" + " (Sperrvermerk) (Sperrvermerk)" + "\n" + "„Sperrvermerk“ „Sperrvermerk“" + "\n" + "Der Sperrvermerk Sperrvermerk" + "\n" + "correct Sperr|ver|merk");
+        Paragraph paragraph = new Paragraph(text);
+        paragraph.setWidth(150);
+        paragraph.setTextAlignment(TextAlignment.JUSTIFIED);
+        paragraph.setHyphenation(new HyphenationConfig("de", "DE", 2, 2));
+
+        doc.add(paragraph);
+
+        doc.close();
+
+        Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder, "diff"));
+    }
+
 }

layout/src/test/java/com/itextpdf/layout/HyphenateResultTest.java

@@ -71,6 +71,17 @@ public void softHyphenTest01() {
         testHyphenateResult("de", "Ann\u00ADuit\u00ADätendarl\u00ADehen", new int[]{3, 7, 16});
     }
 
+    @Test
+    public void stackoverflowTestDe() {
+        //https://stackoverflow.com/
+        testHyphenateResult("de", "https://stackoverflow.com/", new int[]{3, 14, 17});
+    }
+
+    @Test
+    public void stackoverflowTestEn() {
+        //https://stackoverflow.com/
+        testHyphenateResult("en", "https://stackoverflow.com/", new int[]{13, 17});
+    }
 
     private void testHyphenateResult(String lang, String testWorld, int[] expectedHyphenatePoints) {
         String[] parts = lang.split("_");