Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Refactor RendererAgg.draw_{mathtext,text,tex} to use same base algorithm #31085

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 4 commits into from
Feb 6, 2026
Merged

Refactor RendererAgg.draw_{mathtext,text,tex} to use same base algorithm #31085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
931bcf3
Change RendererAgg.draw_text to use FT2Font._render_glyph
QuLogic Feb 5, 2026
6ec8fc8
Deduplicate RendererAgg.draw_{mathtext,text}
QuLogic Feb 5, 2026
9a185c6
Deduplicate RendererAgg.draw_tex with draw_{mathtext,text}
QuLogic Feb 5, 2026
754bdab
Also deduplicate box rendering in RendererAgg.draw_{mathtext,tex}
QuLogic Feb 5, 2026
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
121 changes: 37 additions & 84 deletions lib/matplotlib/backends/backend_agg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,41 +172,41 @@ def draw_path(self, gc, path, transform, rgbFace=None):

raise OverflowError(msg) from None

def draw_mathtext(self, gc, x, y, s, prop, angle):
"""Draw mathtext using :mod:`matplotlib.mathtext`."""
def _draw_text_glyphs_and_boxes(self, gc, x, y, angle, glyphs, boxes):
# y is downwards.
parse = self.mathtext_parser.parse(
s, self.dpi, prop, antialiased=gc.get_antialiased())
cos = math.cos(math.radians(angle))
sin = math.sin(math.radians(angle))
for font, size, _char, glyph_index, dx, dy in parse.glyphs: # dy is upwards.
load_flags = get_hinting_flag()
for font, size, glyph_index, slant, extend, dx, dy in glyphs: # dy is upwards.
font.set_size(size, self.dpi)
hf = font._hinting_factor
font._set_transform(
[[round(0x10000 * cos / hf), round(0x10000 * -sin)],
[round(0x10000 * sin / hf), round(0x10000 * cos)]],
(0x10000 * np.array([[cos, -sin], [sin, cos]])
@ [[extend, extend * slant], [0, 1]]
@ [[1 / hf, 0], [0, 1]]).round().astype(int),
[round(0x40 * (x + dx * cos - dy * sin)),
# FreeType's y is upwards.
round(0x40 * (self.height - y + dx * sin + dy * cos))]
)
bitmap = font._render_glyph(
glyph_index, get_hinting_flag(),
glyph_index, load_flags,
RenderMode.NORMAL if gc.get_antialiased() else RenderMode.MONO)
buffer = np.asarray(bitmap.buffer)
buffer = bitmap.buffer
if not gc.get_antialiased():
buffer *= 0xff
# draw_text_image's y is downwards & the bitmap bottom side.
self._renderer.draw_text_image(
buffer,
bitmap.left, int(self.height) - bitmap.top + buffer.shape[0],
0, gc)

rgba = gc.get_rgb()
if len(rgba) == 3 or gc.get_forced_alpha():
rgba = rgba[:3] + (gc.get_alpha(),)
gc1 = self.new_gc()
gc1.set_linewidth(0)
gc1.set_snap(gc.get_snap())
for dx, dy, w, h in parse.rects: # dy is upwards.
for dx, dy, w, h in boxes: # dy is upwards.
if gc1.get_snap() in [None, True]:
# Prevent thin bars from disappearing by growing symmetrically.
if w < 1:
Expand All @@ -224,25 +224,31 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
rgba)
gc1.restore()

def draw_mathtext(self, gc, x, y, s, prop, angle):
"""Draw mathtext using :mod:`matplotlib.mathtext`."""
parse = self.mathtext_parser.parse(
s, self.dpi, prop, antialiased=gc.get_antialiased())
self._draw_text_glyphs_and_boxes(
gc, x, y, angle,
((font, size, glyph_index, 0, 1, dx, dy)
for font, size, _char, glyph_index, dx, dy in parse.glyphs),
parse.rects)

def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
# docstring inherited
if ismath:
return self.draw_mathtext(gc, x, y, s, prop, angle)
font = self._prepare_font(prop)
font.set_text(s, angle, flags=get_hinting_flag(),
features=mtext.get_fontfeatures() if mtext is not None else None,
language=mtext.get_language() if mtext is not None else None)
for bitmap in font._render_glyphs(
x, self.height - y,
RenderMode.NORMAL if gc.get_antialiased() else RenderMode.MONO,
):
buffer = bitmap.buffer
if not gc.get_antialiased():
buffer *= 0xff
self._renderer.draw_text_image(
buffer,
bitmap.left, int(self.height) - bitmap.top + buffer.shape[0],
0, gc)
items = font._layout(
s, flags=get_hinting_flag(),
features=mtext.get_fontfeatures() if mtext is not None else None,
language=mtext.get_language() if mtext is not None else None)
size = prop.get_size_in_points()
self._draw_text_glyphs_and_boxes(
gc, x, y, angle,
((item.ft_object, size, item.glyph_index, 0, 1, item.x, item.y)
for item in items),
[])

def get_text_width_height_descent(self, s, prop, ismath):
# docstring inherited
Expand Down Expand Up @@ -285,66 +291,13 @@ def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
with Dvi(dvifile, self.dpi) as dvi:
page, = dvi

cos = math.cos(math.radians(angle))
sin = math.sin(math.radians(angle))

for text in page.text:
hf = mpl.rcParams["text.hinting_factor"]
# Resolving text.index will implicitly call get_font(), which
# resets the font transform, so it has to be done before explicitly
# setting the font transform below.
index = text.index
font = get_font(text.font_path)
font.set_size(text.font_size, self.dpi)
slant = text.font_effects.get("slant", 0)
extend = text.font_effects.get("extend", 1)
font._set_transform(
(0x10000 * np.array([[cos, -sin], [sin, cos]])
@ [[extend, extend * slant], [0, 1]]
@ [[1 / hf, 0], [0, 1]]).round().astype(int),
[round(0x40 * (x + text.x * cos - text.y * sin)),
# FreeType's y is upwards.
round(0x40 * (self.height - y + text.x * sin + text.y * cos))]
)
bitmap = font._render_glyph(
index, get_hinting_flag(),
RenderMode.NORMAL if gc.get_antialiased() else RenderMode.MONO)
buffer = np.asarray(bitmap.buffer)
if not gc.get_antialiased():
buffer *= 0xff
# draw_text_image's y is downwards & the bitmap bottom side.
self._renderer.draw_text_image(
buffer,
bitmap.left, int(self.height) - bitmap.top + buffer.shape[0],
0, gc)

rgba = gc.get_rgb()
if len(rgba) == 3 or gc.get_forced_alpha():
rgba = rgba[:3] + (gc.get_alpha(),)
gc1 = self.new_gc()
gc1.set_linewidth(0)
gc1.set_snap(gc.get_snap())
for box in page.boxes:
bx = box.x
by = box.y
bw = box.width
bh = box.height
if gc1.get_snap() in [None, True]:
# Prevent thin bars from disappearing by growing symmetrically.
if bw < 1:
bx -= (1 - bw) / 2
bw = 1
if bh < 1:
by -= (1 - bh) / 2
bh = 1
path = Path._create_closed([
(bx, by), (bx + bw, by), (bx + bw, by + bh), (bx, by + bh)])
self._renderer.draw_path(
gc1, path,
mpl.transforms.Affine2D()
.rotate_deg(angle).translate(x, self.height - y),
rgba)
gc1.restore()
self._draw_text_glyphs_and_boxes(
gc, x, y, angle,
((get_font(text.font_path), text.font_size, text.index,
text.font_effects.get('slant', 0), text.font_effects.get('extend', 1),
text.x, text.y)
for text in page.text),
((box.x, box.y, box.width, box.height) for box in page.boxes))

def get_canvas_width_height(self):
# docstring inherited
Expand Down
10 changes: 0 additions & 10 deletions src/ft2font_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,16 +1933,6 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used())
FT_CHECK(FT_Render_Glyph, face->glyph, render_mode);
return PyPositionedBitmap{face->glyph};
})
.def("_render_glyphs",
[](PyFT2Font *self, double x, double y, FT_Render_Mode render_mode) {
auto origin = FT_Vector{std::lround(x * 64), std::lround(y * 64)};
auto pbs = std::vector<PyPositionedBitmap>{};
for (auto &g: self->get_glyphs()) {
FT_CHECK(FT_Glyph_To_Bitmap, &g, render_mode, &origin, 1);
pbs.emplace_back(reinterpret_cast<FT_BitmapGlyph>(g));
}
return pbs;
})
;

m.attr("__freetype_version__") = version_string;
Expand Down
Loading