Added height argument to wrap()

Author: radarhere

Tests/test_imagetext.py

@@ -83,18 +83,28 @@ def test_stroke() -> None:
         )
 
 
-def test_wrap() -> None:
-    # No wrap required
-    text = ImageText.Text("Hello World!")
-    text.wrap(100)
-    assert text.text == "Hello World!"
-
-    # Wrap word to a new line
-    text = ImageText.Text("Hello World!")
-    text.wrap(50)
-    assert text.text == "Hello\nWorld!"
-
-    # Split word across lines
-    text = ImageText.Text("Hello World!")
-    text.wrap(25)
-    assert text.text == "Hello\nWorl\nd!"
+@pytest.mark.parametrize(
+    "text, width, expected",
+    (
+        ("Hello World!", 100, "Hello World!"),  # No wrap required
+        ("Hello World!", 50, "Hello\nWorld!"),  # Wrap word to a new line
+        ("Hello World!", 25, "Hello\nWorl\nd!"),  # Split word across lines
+        # Keep multiple spaces within a line
+        ("Keep  multiple spaces", 75, "Keep  multiple\nspaces"),
+    ),
+)
+@pytest.mark.parametrize("string", (True, False))
+def test_wrap(text: str, width: int, expected: str, string: bool) -> None:
+    text = ImageText.Text(text if string else text.encode())
+    assert text.wrap(width) is None
+    assert text.text == expected if string else expected.encode()
+
+
+def test_wrap_height() -> None:
+    text = ImageText.Text("Text does not fit within height")
+    assert text.wrap(50, 25).text == " within height"
+    assert text.text == "Text does\nnot fit"
+
+    text = ImageText.Text("Text does not fit singlelongword")
+    assert text.wrap(50, 25).text == " singlelongword"
+    assert text.text == "Text does\nnot fit"

src/PIL/ImageDraw.py

@@ -591,63 +591,62 @@ def getink(fill: _Ink | None) -> int:
                 else ink
             )
 
-        for xy, anchor, line in image_text._split(xy, anchor, align):
+        for line in image_text._split(xy, anchor, align):
 
             def draw_text(ink: int, stroke_width: float = 0) -> None:
                 mode = self.fontmode
                 if stroke_width == 0 and embedded_color:
                     mode = "RGBA"
-                coord = []
-                for i in range(2):
-                    coord.append(int(xy[i]))
-                start = (math.modf(xy[0])[0], math.modf(xy[1])[0])
+                x = int(line.x)
+                y = int(line.y)
+                start = (math.modf(line.x)[0], math.modf(line.y)[0])
                 try:
                     mask, offset = image_text.font.getmask2(  # type: ignore[union-attr,misc]
-                        line,
+                        line.text,
                         mode,
                         direction=direction,
                         features=features,
                         language=language,
                         stroke_width=stroke_width,
                         stroke_filled=True,
-                        anchor=anchor,
+                        anchor=line.anchor,
                         ink=ink,
                         start=start,
                         *args,
                         **kwargs,
                     )
-                    coord = [coord[0] + offset[0], coord[1] + offset[1]]
+                    x += offset[0]
+                    y += offset[1]
                 except AttributeError:
                     try:
                         mask = image_text.font.getmask(  # type: ignore[misc]
-                            line,
+                            line.text,
                             mode,
                             direction,
                             features,
                             language,
                             stroke_width,
-                            anchor,
+                            line.anchor,
                             ink,
                             start=start,
                             *args,
                             **kwargs,
                         )
                     except TypeError:
-                        mask = image_text.font.getmask(line)
+                        mask = image_text.font.getmask(line.text)
                 if mode == "RGBA":
                     # image_text.font.getmask2(mode="RGBA")
                     # returns color in RGB bands and mask in A
                     # extract mask and set text alpha
                     color, mask = mask, mask.getband(3)
                     ink_alpha = struct.pack("i", ink)[3]
                     color.fillband(3, ink_alpha)
-                    x, y = coord
                     if self.im is not None:
                         self.im.paste(
                             color, (x, y, x + mask.size[0], y + mask.size[1]), mask
                         )
                 else:
-                    self.draw.draw_bitmap(coord, mask, ink)
+                    self.draw.draw_bitmap((x, y), mask, ink)
 
             if stroke_ink is not None:
                 # Draw stroked text