matplotlib
diff --git a/‎lib/matplotlib/_constrained_layout.py‎
Lines changed: 11 additions & 9 deletions b/‎lib/matplotlib/_constrained_layout.py‎
Lines changed: 11 additions & 9 deletions
diff --git a/‎lib/matplotlib/figure.py‎
Lines changed: 57 additions & 23 deletions b/‎lib/matplotlib/figure.py‎
Lines changed: 57 additions & 23 deletions
diff --git a/‎lib/matplotlib/tight_layout.py‎
Lines changed: 16 additions & 5 deletions b/‎lib/matplotlib/tight_layout.py‎
Lines changed: 16 additions & 5 deletions
@@ -277,15 +277,17 @@ def _make_margin_suptitles(fig, renderer, *, w_pad=0, h_pad=0):
         fig._suptitle.set_position((p[0], 1-h_pad))
         fig._layoutgrid.edit_margin_min('top', bbox.height + 2 * h_pad)
 
-    if 0:
-        # Not implimented yet!
-        if fig._supxlabel is not None:
-            bbox = invTransFig(fig._supxlabel.get_tightbbox(renderer))
-            fig._layoutgrid.edit_margin_min('bottom', bbox.height + 2 * h_pad)
-
-        if fig._supylabel is not None:
-            bbox = invTransFig(fig._supylabel.get_tightbbox(renderer))
-            fig._layoutgrid.edit_margin_min('left', bbox.width + 2 * w_pad)
+    if fig._supxlabel is not None:
+        bbox = invTransFig(fig._supxlabel.get_tightbbox(renderer))
+        p = fig._supxlabel.get_position()
+        fig._supxlabel.set_position((p[0], h_pad))
+        fig._layoutgrid.edit_margin_min('bottom', bbox.height + 2 * h_pad)
+
+    if fig._supylabel is not None:
+        bbox = invTransFig(fig._supylabel.get_tightbbox(renderer))
+        p = fig._supylabel.get_position()
+        fig._supylabel.set_position((h_pad, p[1]))
+        fig._layoutgrid.edit_margin_min('left', bbox.width + 2 * w_pad)
 
 
 def _match_submerged_margins(fig):
 
@@ -662,26 +662,27 @@ def get_window_extent(self, *args, **kwargs):
         """
         return self.bbox
 
-    def suptitle(self, t, **kwargs):
+    def _suplabels(self, t, info, **kwargs):
         """
-        Add a centered title to the figure.
+        Add a centered {name} to the figure.
 
         Parameters
         ----------
         t : str
-            The title text.
+            The {name} text.
 
-        x : float, default 0.5
+        x : float, default {x0}
             The x location of the text in figure coordinates.
 
-        y : float, default 0.98
+        y : float, default {y0}
             The y location of the text in figure coordinates.
 
-        horizontalalignment, ha : {'center', 'left', right'}, default: 'center'
+        horizontalalignment, ha : 'center', 'left', 'right', \
+default: {ha}
             The horizontal alignment of the text relative to (*x*, *y*).
 
-        verticalalignment, va : {'top', 'center', 'bottom', 'baseline'}, \
-default: 'top'
+        verticalalignment, va : 'top', 'center', 'bottom', 'baseline', \
+default: {va}
             The vertical alignment of the text relative to (*x*, *y*).
 
         fontsize, size : default: :rc:`figure.titlesize`
@@ -695,7 +696,7 @@ def suptitle(self, t, **kwargs):
         Returns
         -------
         text
-            The `.Text` instance of the title.
+            The `.Text` instance of the {name}.
 
         Other Parameters
         ----------------
@@ -708,19 +709,20 @@ def suptitle(self, t, **kwargs):
         **kwargs
             Additional kwargs are `matplotlib.text.Text` properties.
 
-        Examples
-        --------
-        >>> fig.suptitle('This is the figure title', fontsize=12)
         """
+
         manual_position = ('x' in kwargs or 'y' in kwargs)
+        suplab = getattr(self, info['name'])
 
-        x = kwargs.pop('x', 0.5)
-        y = kwargs.pop('y', 0.98)
+        x = kwargs.pop('x', info['x0'])
+        y = kwargs.pop('y', info['y0'])
 
         if 'horizontalalignment' not in kwargs and 'ha' not in kwargs:
-            kwargs['horizontalalignment'] = 'center'
+            kwargs['horizontalalignment'] = info['ha']
         if 'verticalalignment' not in kwargs and 'va' not in kwargs:
-            kwargs['verticalalignment'] = 'top'
+            kwargs['verticalalignment'] = info['va']
+        if 'rotation' not in kwargs:
+            kwargs['rotation'] = info['rotation']
 
         if 'fontproperties' not in kwargs:
             if 'fontsize' not in kwargs and 'size' not in kwargs:
@@ -729,17 +731,47 @@ def suptitle(self, t, **kwargs):
                 kwargs['weight'] = mpl.rcParams['figure.titleweight']
 
         sup = self.text(x, y, t, **kwargs)
-        if self._suptitle is not None:
-            self._suptitle.set_text(t)
-            self._suptitle.set_position((x, y))
-            self._suptitle.update_from(sup)
+        if suplab is not None:
+            suplab.set_text(t)
+            suplab.set_position((x, y))
+            suplab.update_from(sup)
             sup.remove()
         else:
-            self._suptitle = sup
+            suplab = sup
         if manual_position:
-            self._suptitle.set_in_layout(False)
+            suplab.set_in_layout(False)
+        setattr(self, info['name'], suplab)
         self.stale = True
-        return self._suptitle
+        return suplab
+
+
+    def suptitle(self, t, **kwargs):
+        # docstring from _suplabels...
+        info = {'name': '_suptitle', 'x0': 0.5, 'y0': 0.98,
+                'ha': 'center', 'va': 'top', 'rotation': 0}
+        return self._suplabels(t, info, **kwargs)
+
+    suptitle.__doc__ = _suplabels.__doc__.format(
+        x0=0.5, y0=0.98, name='suptitle', ha='center', va='top')
+
+    def supxlabel(self, t, **kwargs):
+        # docstring from _suplabels...
+        info = {'name': '_supxlabel', 'x0': 0.5, 'y0': 0.01,
+                'ha': 'center', 'va': 'bottom', 'rotation': 0}
+        return self._suplabels(t, info, **kwargs)
+
+    supxlabel.__doc__ = _suplabels.__doc__.format(
+        x0=0.5, y0=0.01, name='supxlabel', ha='center', va='bottom')
+
+    def supylabel(self, t, **kwargs):
+        # docstring from _suplabels...
+        info = {'name': '_supylabel', 'x0': 0.02, 'y0': 0.5,
+                'ha': 'left', 'va': 'center', 'rotation': 90}
+        return self._suplabels(t, info, **kwargs)
+
+    supylabel.__doc__ = _suplabels.__doc__.format(
+        x0=0.02, y0=0.5, name='supylabel', ha='left', va='center')
+
 
     def set_canvas(self, canvas):
         """
@@ -1603,6 +1635,8 @@ def clf(self, keep_observers=False):
         if not keep_observers:
             self._axobservers = cbook.CallbackRegistry()
         self._suptitle = None
+        self._supxlabel = None
+        self._supylabel = None
         if self.get_constrained_layout():
             layoutgrid.nonetree(self._layoutgrid)
         self.stale = True
 
@@ -108,20 +108,31 @@ def auto_adjust_subplotpars(
     if not margin_left:
         margin_left = (max(hspaces[:, 0].max(), 0)
                        + pad_inches / fig_width_inch)
+        suplabel = fig._supylabel
+        if suplabel and suplabel.get_in_layout():
+            rel_width = fig.transFigure.inverted().transform_bbox(
+                suplabel.get_window_extent(renderer)).width
+            margin_left += rel_width + pad_inches / fig_width_inch
+
     if not margin_right:
         margin_right = (max(hspaces[:, -1].max(), 0)
                         + pad_inches / fig_width_inch)
     if not margin_top:
         margin_top = (max(vspaces[0, :].max(), 0)
                       + pad_inches / fig_height_inch)
-        suptitle = fig._suptitle
-        if suptitle and suptitle.get_in_layout():
-            rel_suptitle_height = fig.transFigure.inverted().transform_bbox(
-                suptitle.get_window_extent(renderer)).height
-            margin_top += rel_suptitle_height + pad_inches / fig_height_inch
+        suplabel = fig._suptitle
+        if suplabel and suplabel.get_in_layout():
+            rel_height = fig.transFigure.inverted().transform_bbox(
+                suplabel.get_window_extent(renderer)).height
+            margin_top += rel_height + pad_inches / fig_height_inch
     if not margin_bottom:
         margin_bottom = (max(vspaces[-1, :].max(), 0)
                          + pad_inches / fig_height_inch)
+        suplabel = fig._supxlabel
+        if suplabel and suplabel.get_in_layout():
+            rel_height = fig.transFigure.inverted().transform_bbox(
+                suplabel.get_window_extent(renderer)).height
+            margin_bottom += rel_height + pad_inches / fig_height_inch
 
     if margin_left + margin_right >= 1:
         cbook._warn_external('Tight layout not applied. The left and right '