Account for both axis_text margins

Previously only the margin between the text and the ticks
was accounted for in the layout. Now the margin between the
text and axis title works.

Author: has2k1

plotnine/_mpl/layout_manager/_layout_items.py

@@ -342,14 +342,8 @@ def axis_text_x_max_height(self, ax: Axes) -> float:
         """
         Return maximum height[figure space] of x tick labels
         """
-        top_margin = (
-            0
-            if self._is_blank("axis_text_x")
-            else self.plot.theme.get_margin("axis_text_x").fig.t
-        )
         heights = [
-            self.calc.tight_height(label) + top_margin
-            for label in self.axis_text_x(ax)
+            self.calc.tight_height(label) for label in self.axis_text_x(ax)
         ]
         return max(heights) if len(heights) else 0
 
@@ -378,14 +372,8 @@ def axis_text_y_max_width(self, ax: Axes) -> float:
         """
         Return maximum width[figure space] of y tick labels
         """
-        right_margin = (
-            0
-            if self._is_blank("axis_text_y")
-            else self.plot.theme.get_margin("axis_text_y").fig.r
-        )
         widths = [
-            self.calc.tight_width(label) + right_margin
-            for label in self.axis_text_y(ax)
+            self.calc.tight_width(label) for label in self.axis_text_y(ax)
         ]
         return max(widths) if len(widths) else 0
 

plotnine/_mpl/layout_manager/_spaces.py

@@ -222,7 +222,9 @@ class left_spaces(_side_spaces):
     axis_title_y_margin_left: float = 0
     axis_title_y: float = 0
     axis_title_y_margin_right: float = 0
+    axis_text_y_margin_left: float = 0
     axis_text_y: float = 0
+    axis_text_y_margin_right: float = 0
     axis_ticks_y: float = 0
 
     def _calculate(self):
@@ -256,6 +258,11 @@ def _calculate(self):
 
         # Account for the space consumed by the axis
         self.axis_text_y = items.axis_text_y_max_width_at("first_col")
+        if self.axis_text_y:
+            m = theme.get_margin("axis_text_y").fig
+            self.axis_text_y_margin_left = m.l
+            self.axis_text_y_margin_right = m.r
+
         self.axis_ticks_y = items.axis_ticks_y_max_width_at("first_col")
 
         # Adjust plot_margin to make room for ylabels that protude well
@@ -576,7 +583,9 @@ class bottom_spaces(_side_spaces):
     axis_title_x_margin_bottom: float = 0
     axis_title_x: float = 0
     axis_title_x_margin_top: float = 0
+    axis_text_x_margin_bottom: float = 0
     axis_text_x: float = 0
+    axis_text_x_margin_top: float = 0
     axis_ticks_x: float = 0
 
     def _calculate(self):
@@ -616,8 +625,12 @@ def _calculate(self):
             self.axis_title_x_margin_top = m.t * F
 
         # Account for the space consumed by the axis
-        self.axis_ticks_x = items.axis_ticks_x_max_height_at("last_row")
         self.axis_text_x = items.axis_text_x_max_height_at("last_row")
+        if self.axis_text_x:
+            m = theme.get_margin("axis_text_x").fig
+            self.axis_text_x_margin_bottom = m.b
+            self.axis_text_x_margin_top = m.t
+        self.axis_ticks_x = items.axis_ticks_x_max_height_at("last_row")
 
         # Adjust plot_margin to make room for ylabels that protude well
         # beyond the axes