Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-14 11:59:49 +03:00
Code Activity

[translations] Resolve issue with lines over characters for some languages, and some wrong characters used (#1268)

Browse source 
* Resolve a problem in font generation when y_offset is negative.

* Change to use full dynamic detection of special chars, generalized for all languages including cjk.

* Isolated colorlcd and bwlcd translation encoding method.

* Fixed the cz char mapping.

* Only cz requires subset lowercase handling.
This commit is contained in:
richardclli 2021-12-27 09:43:17 +08:00 • committed by GitHub
parent b0791e2afa
commit 230ac34e86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 94 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tools/build-font-bitmap.py
View file

@ -5,7 +5,7 @@ import argparse
import os
import sys
from PIL import Image, ImageDraw, ImageFont
from charset import get_chars, special_chars, extra_chars, standard_chars, is_cjk_char
from charset import get_chars, special_chars, extra_chars, standard_chars
EXTRA_BITMAP_MAX_WIDTH = 297
@ -50,7 +50,7 @@ class FontBitmap:
return (text_width, text_height)
def draw_char(self, draw, x, c):
def draw_char(self, draw, x, y, c):
# default width for space
width = 4
@ -64,7 +64,7 @@ class FontBitmap:
width = self.font.getmask(c).getbbox()[2]
_, (offset_x, offset_y) = self.font.font.getsize(c)
draw.text((x - offset_x, 0), c, fill=self.foreground, font=self.font)
draw.text((x - offset_x, y), c, fill=self.foreground, font=self.font)
return width
@ -73,6 +73,11 @@ class FontBitmap:
(_,baseline), (offset_x, offset_y) = self.font.font.getsize(self.chars)
(text_width, text_height) = self.get_text_dimensions(self.chars)
y_shifts = 0
if offset_y < 0:
y_shifts = -offset_y
text_height += y_shifts
offset_y = 0
img_width = text_width + self.extra_bitmap_width
image = Image.new("RGB", (img_width, text_height), self.background)
@ -89,7 +94,7 @@ class FontBitmap:
if self.extra_bitmap:
# copy extra_bitmap at once
image.paste(self.extra_bitmap, (width, offset_y))
image.paste(self.extra_bitmap, (width, offset_y + y_shifts))
# append width for extra_bitmap symbols
for coord in [14, 14, 12, 12, 13, 13, 13, 13, 13] + [15] * 12:
@ -106,7 +111,7 @@ class FontBitmap:
continue
# normal characters + CJK
w = self.draw_char(draw, width, c)
w = self.draw_char(draw, width, y_shifts, c)
coords.append(width)
width += w