python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-04-20 17:22:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not justify a single word

Browse Source
This commit is contained in:
Andrew Murray 2025-04-17 19:23:24 +10:00
parent 3d4119521c
commit cccc07269a
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/multiline_text_justify_single_word.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

12
Tests/test_imagefont.py
View File

@ -267,6 +267,18 @@ def test_render_multiline_text_align(
assert_image_similar_tofile(im, f"Tests/images/multiline_text{ext}.png", 0.01)
def test_render_multiline_text_align_justify_single_word(
font: ImageFont.FreeTypeFont,
) -> None:
im = Image.new("RGB", (185, 65))
draw = ImageDraw.Draw(im)
draw.multiline_text(
(0, 0), "hey you\nyou are awesome\nthis", font=font, align="justify"
)
assert_image_equal_tofile(im, "Tests/images/multiline_text_justify_single_word.png")
def test_unknown_align(font: ImageFont.FreeTypeFont) -> None:
im = Image.new(mode="RGB", size=(300, 100))
draw = ImageDraw.Draw(im)

36
src/PIL/ImageDraw.py
View File

@ -772,24 +772,26 @@ class ImageDraw:
if align == "justify" and width_difference != 0:
words = line.split(" " if isinstance(text, str) else b" ")
word_widths = [
self.textlength(
word,
font,
direction=direction,
features=features,
language=language,
embedded_color=embedded_color,
)
for word in words
]
width_difference = max_width - sum(word_widths)
for i, word in enumerate(words):
parts.append(((left, top), word))
left += word_widths[i] + width_difference / (len(words) - 1)
else:
parts.append(((left, top), line))
if len(words) > 1:
word_widths = [
self.textlength(
word,
font,
direction=direction,
features=features,
language=language,
embedded_color=embedded_color,
)
for word in words
]
width_difference = max_width - sum(word_widths)
for i, word in enumerate(words):
parts.append(((left, top), word))
left += word_widths[i] + width_difference / (len(words) - 1)
top += line_spacing
continue
parts.append(((left, top), line))
top += line_spacing
return font, anchor, parts