Merge pull request #11461 from fredrik-1/text_alias_change

NelleV · web-flow · commit 0a7c0d2ff7c4 · 2018-06-22T23:15:11.000-07:00
Fixed bug in rendering font property kwargs list
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -1080,7 +1080,7 @@ def get_aliases(self):
             if not self.is_alias(func):
                 continue
             docstring = func.__doc__
-            fullname = docstring[10:]
+            fullname = docstring.replace('`', '')[10:]
             aliases.setdefault(fullname[4:], {})[name[4:]] = None
         return aliases
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -107,17 +107,17 @@ def _get_textbox(text, renderer):
 
 
 @cbook._define_aliases({
-    "family": ["fontfamily"],
+    "fontfamily": ["family"],
     "fontproperties": ["font_properties"],
     "horizontalalignment": ["ha"],
     "multialignment": ["ma"],
-    "name": ["fontname"],
-    "size": ["fontsize"],
-    "stretch": ["fontstretch"],
-    "style": ["fontstyle"],
-    "variant": ["fontvariant"],
+    "fontname": ["name"],
+    "fontsize": ["size"],
+    "fontstretch": ["stretch"],
+    "fontstyle": ["style"],
+    "fontvariant": ["variant"],
     "verticalalignment": ["va"],
-    "weight": ["fontweight"],
+    "fontweight": ["weight"],
 })
 class Text(Artist):
     """Handle storing and drawing of text in window or data coordinates."""
@@ -764,27 +764,27 @@ def get_fontproperties(self):
         "Return the :class:`~font_manager.FontProperties` object"
         return self._fontproperties
 
-    def get_family(self):
+    def get_fontfamily(self):
         "Return the list of font families used for font lookup"
         return self._fontproperties.get_family()
 
-    def get_name(self):
+    def get_fontname(self):
         "Return the font name as string"
         return self._fontproperties.get_name()
 
-    def get_style(self):
+    def get_fontstyle(self):
         "Return the font style as string"
         return self._fontproperties.get_style()
 
-    def get_size(self):
+    def get_fontsize(self):
         "Return the font size as integer"
         return self._fontproperties.get_size_in_points()
 
-    def get_variant(self):
+    def get_fontvariant(self):
         "Return the font variant as a string"
         return self._fontproperties.get_variant()
 
-    def get_weight(self):
+    def get_fontweight(self):
         "Get the font weight as string or number"
         return self._fontproperties.get_weight()
 
@@ -967,7 +967,7 @@ def set_linespacing(self, spacing):
         self._linespacing = spacing
         self.stale = True
 
-    def set_family(self, fontname):
+    def set_fontfamily(self, fontname):
         """
         Set the font family.  May be either a single string, or a list of
         strings in decreasing priority.  Each string may be either a real font
@@ -982,7 +982,7 @@ def set_family(self, fontname):
         self._fontproperties.set_family(fontname)
         self.stale = True
 
-    def set_variant(self, variant):
+    def set_fontvariant(self, variant):
         """
         Set the font variant, either 'normal' or 'small-caps'.
 
@@ -993,7 +993,7 @@ def set_variant(self, variant):
         self._fontproperties.set_variant(variant)
         self.stale = True
 
-    def set_style(self, fontstyle):
+    def set_fontstyle(self, fontstyle):
         """
         Set the font style.
 
@@ -1004,7 +1004,7 @@ def set_style(self, fontstyle):
         self._fontproperties.set_style(fontstyle)
         self.stale = True
 
-    def set_size(self, fontsize):
+    def set_fontsize(self, fontsize):
         """
         Set the font size.  May be either a size string, relative to
         the default font size, or an absolute font size in points.
@@ -1017,7 +1017,7 @@ def set_size(self, fontsize):
         self._fontproperties.set_size(fontsize)
         self.stale = True
 
-    def set_weight(self, weight):
+    def set_fontweight(self, weight):
         """
         Set the font weight.
 
@@ -1030,7 +1030,7 @@ def set_weight(self, weight):
         self._fontproperties.set_weight(weight)
         self.stale = True
 
-    def set_stretch(self, stretch):
+    def set_fontstretch(self, stretch):
         """
         Set the font stretch (horizontal condensation or expansion).
 
@@ -1182,8 +1182,12 @@ def get_usetex(self):
         else:
             return self._usetex
 
-    def set_name(self, fontname):  # One-way alias only: the getter differs.
-        """alias for set_family"""
+    def set_fontname(self, fontname):
+        """
+        alias for set_family
+
+        One-way alias only: the getter differs.
+        """
         return self.set_family(fontname)
 
 
