Also deduplicate box rendering in RendererAgg.draw_{mathtext,tex}

QuLogic · QuLogic · commit 49d5ac999006 · 2026-02-05T21:08:14.000-05:00
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -172,7 +172,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):
 
                 raise OverflowError(msg) from None
 
-    def _draw_text_glyphs(self, gc, x, y, angle, glyphs):
+    def _draw_text_glyphs_and_boxes(self, gc, x, y, angle, glyphs, boxes):
         # y is downwards.
         cos = math.cos(math.radians(angle))
         sin = math.sin(math.radians(angle))
@@ -200,21 +200,13 @@ def _draw_text_glyphs(self, gc, x, y, angle, glyphs):
                 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, 0, 1, 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(),)
         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:
@@ -232,6 +224,16 @@ 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:
@@ -242,10 +244,11 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             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(
+        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))
+             for item in items),
+            [])
 
     def get_text_width_height_descent(self, s, prop, ismath):
         # docstring inherited
@@ -288,40 +291,13 @@ def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
         with Dvi(dvifile, self.dpi) as dvi:
             page, = dvi
 
-        self._draw_text_glyphs(
+        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))
-
-        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()
+             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
