Merge d502827e9b into 94ec04d33e

Tests/test_imagedraw.py

@@ -1376,8 +1376,8 @@ def test_textbbox_stroke() -> None:
     # Act / Assert
     assert draw.textbbox((2, 2), "A", font, stroke_width=2) == (0, 4, 16, 20)
     assert draw.textbbox((2, 2), "A", font, stroke_width=4) == (-2, 2, 18, 22)
-    assert draw.textbbox((2, 2), "ABC\nAaaa", font, stroke_width=2) == (0, 4, 52, 44)
-    assert draw.textbbox((2, 2), "ABC\nAaaa", font, stroke_width=4) == (-2, 2, 54, 50)
+    assert draw.textbbox((2, 2), "ABC\nAaaa", font, stroke_width=2) == (0, 4, 52, 48)
+    assert draw.textbbox((2, 2), "ABC\nAaaa", font, stroke_width=4) == (-2, 2, 54, 54)
 
 
 @skip_unless_feature("freetype2")

Tests/test_imagefont.py

@@ -223,7 +223,7 @@ def test_float_size(layout_engine: ImageFont.Layout) -> None:
 def test_render_multiline(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
-    line_spacing = font.getbbox("A")[3] + 4
+    line_spacing = font.getbbox("Aj")[3] + 4
     lines = TEST_TEXT.split("\n")
     y: float = 0
     for line in lines:

Tests/test_imagetext.py

@@ -154,8 +154,8 @@ def test_wrap_height() -> None:
     text = ImageText.Text("Text does not fit within height")
     wrapped = text.wrap(width, 25 if features.check_module("freetype2") else 40)
     assert wrapped is not None
-    assert wrapped.text == " within height"
-    assert text.text == "Text does\nnot fit"
+    assert wrapped.text == " not fit within height"
+    assert text.text == "Text does"
 
     text = ImageText.Text("Text does not fit\nwithin height")
     wrapped = text.wrap(width, 20)
@@ -166,8 +166,8 @@ def test_wrap_height() -> None:
     text = ImageText.Text("Text does not fit\n\nwithin height")
     wrapped = text.wrap(width, 25 if features.check_module("freetype2") else 40)
     assert wrapped is not None
-    assert wrapped.text == "\nwithin height"
-    assert text.text == "Text does\nnot fit"
+    assert wrapped.text == " not fit\n\nwithin height"
+    assert text.text == "Text does"
 
 
 def test_wrap_scaling_unsupported() -> None:

src/PIL/ImageText.py

@@ -353,7 +353,7 @@ class Text(Generic[AnyStr]):
         fontmode = self._get_fontmode()
         line_spacing = (
             self.font.getbbox(
-                "A",
+                "Aj",
                 fontmode,
                 None,
                 self.features,