Simplify Figure._suplabels.

Rely on alias normalization machinery to make alias checking simpler and
more robust (there are also aliases for fontproperties which were not
checked before).

While at it, also slightly reorder Text aliases (this has no actual
visible effect) to have the font properties and the alignments grouped.

Author: anntzer

lib/matplotlib/figure.py

@@ -287,8 +287,6 @@ def _suplabels(self, t, info, **kwargs):
             Additional kwargs are `matplotlib.text.Text` properties.
         """
 
-        suplab = getattr(self, info['name'])
-
         x = kwargs.pop('x', None)
         y = kwargs.pop('y', None)
         if info['name'] in ['_supxlabel', '_suptitle']:
@@ -300,29 +298,24 @@ def _suplabels(self, t, info, **kwargs):
         if y is None:
             y = info['y0']
 
-        if 'horizontalalignment' not in kwargs and 'ha' not in kwargs:
-            kwargs['horizontalalignment'] = info['ha']
-        if 'verticalalignment' not in kwargs and 'va' not in kwargs:
-            kwargs['verticalalignment'] = info['va']
-        if 'rotation' not in kwargs:
-            kwargs['rotation'] = info['rotation']
+        kwargs = cbook.normalize_kwargs(kwargs, Text)
+        kwargs.setdefault('horizontalalignment', info['ha'])
+        kwargs.setdefault('verticalalignment', info['va'])
+        kwargs.setdefault('rotation', info['rotation'])
 
         if 'fontproperties' not in kwargs:
-            if 'fontsize' not in kwargs and 'size' not in kwargs:
-                kwargs['size'] = mpl.rcParams[info['size']]
-            if 'fontweight' not in kwargs and 'weight' not in kwargs:
-                kwargs['weight'] = mpl.rcParams[info['weight']]
+            kwargs.setdefault('fontsize', mpl.rcParams[info['size']])
+            kwargs.setdefault('fontweight', mpl.rcParams[info['weight']])
 
-        sup = self.text(x, y, t, **kwargs)
+        suplab = getattr(self, info['name'])
         if suplab is not None:
             suplab.set_text(t)
             suplab.set_position((x, y))
-            suplab.update_from(sup)
-            sup.remove()
+            suplab.set(**kwargs)
         else:
-            suplab = sup
+            suplab = self.text(x, y, t, **kwargs)
+            setattr(self, info['name'], suplab)
         suplab._autopos = autopos
-        setattr(self, info['name'], suplab)
         self.stale = True
         return suplab
 

lib/matplotlib/text.py

@@ -80,17 +80,17 @@ def _get_text_metrics_with_cache_impl(
 @_docstring.interpd
 @_api.define_aliases({
     "color": ["c"],
-    "fontfamily": ["family"],
     "fontproperties": ["font", "font_properties"],
-    "horizontalalignment": ["ha"],
-    "multialignment": ["ma"],
+    "fontfamily": ["family"],
     "fontname": ["name"],
     "fontsize": ["size"],
     "fontstretch": ["stretch"],
     "fontstyle": ["style"],
     "fontvariant": ["variant"],
-    "verticalalignment": ["va"],
     "fontweight": ["weight"],
+    "horizontalalignment": ["ha"],
+    "verticalalignment": ["va"],
+    "multialignment": ["ma"],
 })
 class Text(Artist):
     """Handle storing and drawing of text in window or data coordinates."""