Skip to content

Simplifying glyph stream logic in ps backend #24287

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
tacaswell merged 4 commits into from
Oct 28, 2022
Merged

Simplifying glyph stream logic in ps backend #24287

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e6344c
Switching to a simpler group by logic
404-P4rziv4L Oct 28, 2022
22bad5f
Fixed formatting according to flake8
404-P4rziv4L Oct 28, 2022
6ec4aae
Fixing a stream append
404-P4rziv4L Oct 28, 2022
022d51b
Removing redundant xs_names
404-P4rziv4L Oct 28, 2022
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
Switching to a simpler group by logic
  • Loading branch information
@404-P4rziv4L
404-P4rziv4L committed Oct 28, 2022
commit 3e6344cc44425a3f9ae978c59b91039718691cab
30 changes: 9 additions & 21 deletions lib/matplotlib/backends/backend_ps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from enum import Enum
import functools
from io import StringIO
import itertools
import logging
import os
import pathlib
Expand Down Expand Up @@ -630,10 +631,12 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
if ismath:
return self.draw_mathtext(gc, x, y, s, prop, angle)

stream = [] # list of (ps_name, x, char_name)

if mpl.rcParams['ps.useafm']:
font = self._get_font_afm(prop)
ps_name = (font.postscript_name.encode("ascii", "replace").decode("ascii"))
scale = 0.001 * prop.get_size_in_points()
stream = []
thisx = 0
last_name = None # kerns returns 0 for None.
xs_names = []
Expand All @@ -647,38 +650,23 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
kern = font.get_kern_dist_from_name(last_name, name)
last_name = name
thisx += kern * scale
xs_names.append((thisx, name))
xs_names.append((ps_name, thisx, name))
thisx += width * scale
ps_name = (font.postscript_name
.encode("ascii", "replace").decode("ascii"))
stream.append((ps_name, xs_names))

else:
font = self._get_font_ttf(prop)
self._character_tracker.track(font, s)
stream = []
prev_font = curr_stream = None
for item in _text_helpers.layout(s, font):
ps_name = (item.ft_object.postscript_name
.encode("ascii", "replace").decode("ascii"))
if item.ft_object is not prev_font:
if curr_stream:
stream.append(curr_stream)
prev_font = item.ft_object
curr_stream = [ps_name, []]
curr_stream[1].append(
(item.x, item.ft_object.get_glyph_name(item.glyph_idx))
)
# append the last entry if exists
if curr_stream:
stream.append(curr_stream)

glyph_name = item.ft_object.get_glyph_name(item.glyph_idx)
stream.append((ps_name, item.x, glyph_name))
self.set_color(*gc.get_rgb())

for ps_name, xs_names in stream:
for ps_name, group in itertools.groupby(stream, lambda entry: entry[0]):
self.set_font(ps_name, prop.get_size_in_points(), False)
thetext = "\n".join(f"{x:g} 0 m /{name:s} glyphshow"
for x, name in xs_names)
for _, x, name in group)
self._pswriter.write(f"""\
gsave
{self._get_clip_cmd(gc)}
Expand Down