Skip to content

Prepare CharacterTracker for advanced font features #30608

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

Merged
QuLogic merged 5 commits into from
Oct 2, 2025
Merged

Prepare CharacterTracker for advanced font features #30608

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50f76ff
Deduplicate `CharacterTracker.track` implementation
QuLogic Sep 27, 2025
8274e17
pdf/ps: Compress subsetted font blocks
QuLogic Sep 27, 2025
70dc388
pdf: Fix first-block characters using multiple glyph representations
QuLogic Sep 27, 2025
df670cf
pdf: Support multi-character glyphs when subsetting
QuLogic Sep 27, 2025
ed5e074
ps: Fix font subset handling
QuLogic Sep 30, 2025
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
Next Next commit
Deduplicate CharacterTracker.track implementation 
No need to repeat the calculation of subset blocks, but instead offload
it to `track_glyph`.
  • Loading branch information
@QuLogic
QuLogic committed Sep 29, 2025
commit 50f76ffb9661450fb8818bf9937f849df0beea84
18 changes: 4 additions & 14 deletions lib/matplotlib/backends/_backend_pdf_ps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,20 +157,10 @@ def track(self, font: FT2Font, s: str) -> list[tuple[int, CharacterCodeType]]:
whole). If *subset_size* is not specified, then the subset will always be 0
and the character codes will be returned from the string unchanged.
"""
font_glyphs = []
char_to_font = font._get_fontmap(s)
for _c, _f in char_to_font.items():
charcode = ord(_c)
glyph_index = _f.get_char_index(charcode)
if self.subset_size != 0:
subset = charcode // self.subset_size
subset_charcode = charcode % self.subset_size
else:
subset = 0
subset_charcode = charcode
self.used.setdefault((_f.fname, subset), {})[subset_charcode] = glyph_index
font_glyphs.append((subset, subset_charcode))
return font_glyphs
return [
self.track_glyph(f, ord(c), f.get_char_index(ord(c)))
for c, f in font._get_fontmap(s).items()
]

def track_glyph(
self, font: FT2Font, charcode: CharacterCodeType,
Expand Down