Skip to content

Add Support for Diacritical Mark, and fix stroke being crop #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Support for Diacritical Mark, and fix stroke being crop #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions trdg/computer_text_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
]
TH_UNDER_VOWELS = ["0xe38", "0xe39", "\0xe3A"]
TH_UPPER_VOWELS = ["0xe31", "0xe34", "0xe35", "0xe36", "0xe37"]
DIACRITICAL_MARKS = [str(hex(x)) for x in range(0x300, 0x36F)]


def generate(
Expand Down Expand Up @@ -70,6 +71,17 @@ def _compute_character_width(image_font: ImageFont, character: str) -> int:
# Casting as int to preserve the old behavior
return round(image_font.getlength(character))

def _combine_diacritical_marks(splitted_text):
diacrit_carry = ''
new_text = []
for p in reversed(splitted_text):
if "{0:#x}".format(ord(p)) in DIACRITICAL_MARKS:
diacrit_carry = p
else:
new_text.append(p+diacrit_carry)
diacrit_carry = ''
return list(reversed(new_text))


def _generate_horizontal_text(
text: str,
Expand All @@ -96,6 +108,7 @@ def _generate_horizontal_text(
else:
splitted_text = text

splitted_text = _combine_diacritical_marks(splitted_text)
piece_widths = [
_compute_character_width(image_font, p) if p != " " else space_width
for p in splitted_text
Expand All @@ -105,6 +118,12 @@ def _generate_horizontal_text(
text_width += character_spacing * (len(text) - 1)

text_height = max([get_text_height(image_font, p) for p in splitted_text])
text_y = 0
if stroke_width > 0:
# push anchor y down to fully draw stroke
text_y = stroke_width
text_width += stroke_width
text_height += stroke_width * 2

txt_img = Image.new("RGBA", (text_width, text_height), (0, 0, 0, 0))
txt_mask = Image.new("RGB", (text_width, text_height), (0, 0, 0))
Expand Down Expand Up @@ -133,15 +152,15 @@ def _generate_horizontal_text(

for i, p in enumerate(splitted_text):
txt_img_draw.text(
(sum(piece_widths[0:i]) + i * character_spacing * int(not word_split), 0),
(sum(piece_widths[0:i]) + i * character_spacing * int(not word_split), text_y),
p,
fill=fill,
font=image_font,
stroke_width=stroke_width,
stroke_fill=stroke_fill,
)
txt_mask_draw.text(
(sum(piece_widths[0:i]) + i * character_spacing * int(not word_split), 0),
(sum(piece_widths[0:i]) + i * character_spacing * int(not word_split), text_y),
p,
fill=((i + 1) // (255 * 255), (i + 1) // 255, (i + 1) % 255),
font=image_font,
Expand Down