eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor stylistic updates

Browse Source
This commit is contained in:
jpirnay
2026-05-05 17:54:38 +02:00
parent b2bfc2c6b8
commit 9fba8b07e9
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/EpdFont/scripts/fontconvert_sdcard.py
+17 -15
View File
@@ -212,17 +212,21 @@ def glyph_entries_by_codepoint(sd, code_point):
def style_uses_synthetic_bold(base_sd, target_sd): def style_uses_synthetic_bold(base_sd, target_sd):
base_entry = next(glyph_entries_by_codepoint(base_sd, ord('A')), None) sample_codepoints = [ord('A'), ord('a'), ord('g'), ord('0')]
target_entry = next(glyph_entries_by_codepoint(target_sd, ord('A')), None) for code_point in sample_codepoints:
if base_entry is None or target_entry is None: base_entry = next(glyph_entries_by_codepoint(base_sd, code_point), None)
return False target_entry = next(glyph_entries_by_codepoint(target_sd, code_point), None)
base_glyph, base_packed = base_entry if base_entry is None or target_entry is None:
target_glyph, target_packed = target_entry return False
if base_glyph.width != target_glyph.width or base_glyph.height != target_glyph.height: base_glyph, base_packed = base_entry
return False target_glyph, target_packed = target_entry
base_pixels = expand_processed_bitmap(base_glyph.width, base_glyph.height, base_packed, 2) if base_glyph.width != target_glyph.width or base_glyph.height != target_glyph.height:
target_pixels = expand_processed_bitmap(target_glyph.width, target_glyph.height, target_packed, 2) return False
return base_pixels == target_pixels base_pixels = expand_processed_bitmap(base_glyph.width, base_glyph.height, base_packed, 2)
target_pixels = expand_processed_bitmap(target_glyph.width, target_glyph.height, target_packed, 2)
if base_pixels != target_pixels:
return False
return True
def apply_synthetic_bold(sd, style_label): def apply_synthetic_bold(sd, style_label):
@@ -572,8 +576,7 @@ def extract_ligatures_fonttools(font_path, codepoints):
def rasterize_font_style(fontfile, size, intervals, style_id=0, force_autohint=False): def rasterize_font_style(fontfile, size, intervals, style_id=0, force_autohint=False):
"""Rasterize all glyphs for one font style. Returns StyleRasterData.""" """Rasterize all glyphs for one font style. Returns StyleRasterData."""
style_names = {0: "regular", 1: "bold", 2: "italic", 3: "bolditalic"} style_label = STYLE_LABELS.get(style_id, str(style_id))
style_label = style_names.get(style_id, str(style_id))
face = freetype.Face(fontfile) face = freetype.Face(fontfile)
# Set font size at 150 DPI (matching fontconvert.py) BEFORE any glyph load # Set font size at 150 DPI (matching fontconvert.py) BEFORE any glyph load
@@ -891,8 +894,7 @@ def generate_cpfont_multistyle(style_fonts, size, intervals, output_path,
for style_id in sorted(raster_data.keys()): for style_id in sorted(raster_data.keys()):
sd = raster_data[style_id] sd = raster_data[style_id]
secs = packed_sections[style_id] secs = packed_sections[style_id]
style_names = {0: "regular", 1: "bold", 2: "italic", 3: "bolditalic"} sname = STYLE_LABELS.get(style_id, str(style_id))
sname = style_names.get(style_id, str(style_id))
ssize = style_sections_total_size(secs) ssize = style_sections_total_size(secs)
print(f" {sname}: {len(sd.all_glyphs)} glyphs, {len(sd.intervals)} intervals, " print(f" {sname}: {len(sd.all_glyphs)} glyphs, {len(sd.intervals)} intervals, "
f"{ssize} bytes", file=sys.stderr) f"{ssize} bytes", file=sys.stderr)