Deduplicate RendererAgg.draw_mathtext and RendererAgg.draw_text

QuLogic · QuLogic · commit bd1b3c776860 · 2026-02-05T04:08:40.000-05:00
All the glyph drawing loop is the same, other than a flexible size in
the former.
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -171,14 +171,12 @@ 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(self, gc, x, y, angle, glyphs):
         # 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, dx, dy in glyphs:  # dy is upwards.
             font.set_size(size, self.dpi)
             hf = font._hinting_factor
             font._set_transform(
@@ -189,16 +187,25 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
                  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)
+
+    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(
+            gc, x, y, angle,
+            ((font, size, glyph_index, dx, dy)
+             for font, size, _char, glyph_index, dx, dy in parse.glyphs))
         rgba = gc.get_rgb()
         if len(rgba) == 3 or gc.get_forced_alpha():
             rgba = rgba[:3] + (gc.get_alpha(),)
@@ -228,32 +235,15 @@ 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)
         font = self._prepare_font(prop)
-        cos = math.cos(math.radians(angle))
-        sin = math.sin(math.radians(angle))
-        load_flags = get_hinting_flag()
         items = font._layout(
-            s, flags=load_flags,
+            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)
-        for item in items:
-            hf = item.ft_object._hinting_factor
-            item.ft_object._set_transform(
-                [[round(0x10000 * cos / hf), round(0x10000 * -sin)],
-                 [round(0x10000 * sin / hf), round(0x10000 * cos)]],
-                [round(0x40 * (x + item.x * cos - item.y * sin)),
-                 # FreeType's y is upwards.
-                 round(0x40 * (self.height - y + item.x * sin + item.y * cos))]
-            )
-            bitmap = item.ft_object._render_glyph(
-                item.glyph_index, load_flags,
-                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)
+        size = prop.get_size_in_points()
+        self._draw_text_glyphs(
+            gc, x, y, angle,
+            ((item.ft_object, size, item.glyph_index, item.x, item.y)
+             for item in items))
 
     def get_text_width_height_descent(self, s, prop, ismath):
         # docstring inherited
