matplotlib · WPurre · Nov 26, 2024
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -197,10 +197,20 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
        xo, yo = font.get_bitmap_offset()
        xo /= 64.0
        yo /= 64.0
-        xd = d * sin(radians(angle))
-        yd = d * cos(radians(angle))
-        x = round(x + xo + xd)
-        y = round(y + yo + yd)
+
+        rad = radians(angle)
+        xd = d * sin(rad)
+        yd = d * cos(rad)
+        # Rotating the offset vector ensures text rotates around the anchor point.
+        # Without this, rotated text offsets incorrectly, causing a horizontal shift.
+        # Applying the 2D rotation matrix.
+        rotated_xo = xo * cos(rad) - yo * sin(rad)
+        rotated_yo = xo * sin(rad) + yo * cos(rad)
+        # Subtract rotated_yo to account for the inverted y-axis in computer graphics,
+        # compared to the mathematical convention.
+        x = round(x + rotated_xo + xd)
+        y = round(y - rotated_yo + yd)
+
        self._renderer.draw_text_image(font, x, y + 1, angle, gc)

    def get_text_width_height_descent(self, s, prop, ismath):

diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_units.png b/lib/matplotlib/tests/baseline_images/test_axes/fill_units.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pcolor_datetime_axis.png b/lib/matplotlib/tests/baseline_images/test_axes/pcolor_datetime_axis.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_datetime_axis.png b/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_datetime_axis.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/test_stairs_datetime.png b/lib/matplotlib/tests/baseline_images/test_axes/test_stairs_datetime.png
diff --git a/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout1.png b/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout1.png
diff --git a/...atplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11.png b/...atplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11.png
diff --git a/...lotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11rat.png b/...lotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11rat.png
diff --git a/...atplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout12.png b/...atplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout12.png
diff --git a/...atplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout14.png b/...atplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout14.png
diff --git a/...atplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout17.png b/...atplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout17.png
diff --git a/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout2.png b/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout2.png
diff --git a/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout3.png b/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout3.png
diff --git a/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout4.png b/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout4.png
diff --git a/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout5.png b/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout5.png
diff --git a/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout6.png b/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout6.png
diff --git a/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout8.png b/...matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout8.png
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_datetime_axis.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_datetime_axis.png
diff --git a/...matplotlib/tests/baseline_images/test_contour/contour_disconnected_segments.png b/...matplotlib/tests/baseline_images/test_contour/contour_disconnected_segments.png
diff --git a/...matplotlib/tests/baseline_images/test_contour/contour_test_label_transforms.png b/...matplotlib/tests/baseline_images/test_contour/contour_test_label_transforms.png
diff --git a/...matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.png b/...matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.png
diff --git a/lib/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.png b/lib/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.png
diff --git a/lib/matplotlib/tests/baseline_images/test_dates/date_axvline.png b/lib/matplotlib/tests/baseline_images/test_dates/date_axvline.png
diff --git a/lib/matplotlib/tests/baseline_images/test_dates/date_axvspan.png b/lib/matplotlib/tests/baseline_images/test_dates/date_axvspan.png
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/figure_align_labels.png b/lib/matplotlib/tests/baseline_images/test_figure/figure_align_labels.png
diff --git a/...atplotlib/tests/baseline_images/test_figure/figure_align_titles_constrained.png b/...atplotlib/tests/baseline_images/test_figure/figure_align_titles_constrained.png
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/figure_align_titles_tight.png b/lib/matplotlib/tests/baseline_images/test_figure/figure_align_titles_tight.png
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/figure_suptitle.png b/lib/matplotlib/tests/baseline_images/test_figure/figure_suptitle.png
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png b/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png
diff --git a/lib/matplotlib/tests/baseline_images/test_polar/polar_rlabel_position.png b/lib/matplotlib/tests/baseline_images/test_polar/polar_rlabel_position.png
diff --git a/lib/matplotlib/tests/baseline_images/test_polar/polar_theta_wedge.png b/lib/matplotlib/tests/baseline_images/test_polar/polar_theta_wedge.png
diff --git a/lib/matplotlib/tests/baseline_images/test_text/multiline2.png b/lib/matplotlib/tests/baseline_images/test_text/multiline2.png
diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.png b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.png
diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout3.png b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout3.png
diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.png b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.png
diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.png b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.png
diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout7.png b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout7.png
diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout8.png b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout8.png
diff --git a/lib/matplotlib/tests/baseline_images/test_units/jpl_barh_units.png b/lib/matplotlib/tests/baseline_images/test_units/jpl_barh_units.png
diff --git a/lib/matplotlib/tests/baseline_images/test_units/plot_pint.png b/lib/matplotlib/tests/baseline_images/test_units/plot_pint.png
diff --git a/...ts/axisartist/tests/baseline_images/test_axis_artist/axis_artist_ticklabels.png b/...ts/axisartist/tests/baseline_images/test_axis_artist/axis_artist_ticklabels.png
diff --git a/...toolkits/axisartist/tests/baseline_images/test_axislines/subplotzero_ylabel.png b/...toolkits/axisartist/tests/baseline_images/test_axislines/subplotzero_ylabel.png
diff --git a/...its/axisartist/tests/baseline_images/test_grid_helper_curvelinear/polar_box.png b/...its/axisartist/tests/baseline_images/test_grid_helper_curvelinear/polar_box.png
diff --git a/...ot3d/tests/baseline_images/test_axes3d/surface3d_label_offset_tick_position.png b/...ot3d/tests/baseline_images/test_axes3d/surface3d_label_offset_tick_position.png