Merge pull request #23322 from anntzer/fex

timhoffm · web-flow · commit d141366b2727 · 2022-06-22T16:02:15.000+02:00
Cleanup FontProperties examples.
diff --git a/examples/text_labels_and_annotations/fonts_demo.py b/examples/text_labels_and_annotations/fonts_demo.py
@@ -11,89 +11,60 @@
 from matplotlib.font_manager import FontProperties
 import matplotlib.pyplot as plt
 
-font0 = FontProperties()
+fig = plt.figure()
 alignment = {'horizontalalignment': 'center', 'verticalalignment': 'baseline'}
-# Show family options
-
-families = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
-
-font1 = font0.copy()
-font1.set_size('large')
-
-t = plt.figtext(0.1, 0.9, 'family', fontproperties=font1, **alignment)
-
 yp = [0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2]
+heading_font = FontProperties(size='large')
 
+# Show family options
+fig.text(0.1, 0.9, 'family', fontproperties=heading_font, **alignment)
+families = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
 for k, family in enumerate(families):
-    font = font0.copy()
+    font = FontProperties()
     font.set_family(family)
-    t = plt.figtext(0.1, yp[k], family, fontproperties=font, **alignment)
+    fig.text(0.1, yp[k], family, fontproperties=font, **alignment)
 
 # Show style options
-
 styles = ['normal', 'italic', 'oblique']
-
-t = plt.figtext(0.3, 0.9, 'style', fontproperties=font1, **alignment)
-
+fig.text(0.3, 0.9, 'style', fontproperties=heading_font, **alignment)
 for k, style in enumerate(styles):
-    font = font0.copy()
+    font = FontProperties()
     font.set_family('sans-serif')
     font.set_style(style)
-    t = plt.figtext(0.3, yp[k], style, fontproperties=font, **alignment)
+    fig.text(0.3, yp[k], style, fontproperties=font, **alignment)
 
 # Show variant options
-
 variants = ['normal', 'small-caps']
-
-t = plt.figtext(0.5, 0.9, 'variant', fontproperties=font1, **alignment)
-
+fig.text(0.5, 0.9, 'variant', fontproperties=heading_font, **alignment)
 for k, variant in enumerate(variants):
-    font = font0.copy()
+    font = FontProperties()
     font.set_family('serif')
     font.set_variant(variant)
-    t = plt.figtext(0.5, yp[k], variant, fontproperties=font, **alignment)
+    fig.text(0.5, yp[k], variant, fontproperties=font, **alignment)
 
 # Show weight options
-
 weights = ['light', 'normal', 'medium', 'semibold', 'bold', 'heavy', 'black']
-
-t = plt.figtext(0.7, 0.9, 'weight', fontproperties=font1, **alignment)
-
+fig.text(0.7, 0.9, 'weight', fontproperties=heading_font, **alignment)
 for k, weight in enumerate(weights):
-    font = font0.copy()
+    font = FontProperties()
     font.set_weight(weight)
-    t = plt.figtext(0.7, yp[k], weight, fontproperties=font, **alignment)
+    fig.text(0.7, yp[k], weight, fontproperties=font, **alignment)
 
 # Show size options
-
-sizes = ['xx-small', 'x-small', 'small', 'medium', 'large',
-         'x-large', 'xx-large']
-
-t = plt.figtext(0.9, 0.9, 'size', fontproperties=font1, **alignment)
-
+sizes = [
+    'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']
+fig.text(0.9, 0.9, 'size', fontproperties=heading_font, **alignment)
 for k, size in enumerate(sizes):
-    font = font0.copy()
+    font = FontProperties()
     font.set_size(size)
-    t = plt.figtext(0.9, yp[k], size, fontproperties=font, **alignment)
+    fig.text(0.9, yp[k], size, fontproperties=font, **alignment)
 
 # Show bold italic
-
-font = font0.copy()
-font.set_style('italic')
-font.set_weight('bold')
-font.set_size('x-small')
-t = plt.figtext(0.3, 0.1, 'bold italic', fontproperties=font, **alignment)
-
-font = font0.copy()
-font.set_style('italic')
-font.set_weight('bold')
-font.set_size('medium')
-t = plt.figtext(0.3, 0.2, 'bold italic', fontproperties=font, **alignment)
-
-font = font0.copy()
-font.set_style('italic')
-font.set_weight('bold')
-font.set_size('x-large')
-t = plt.figtext(-0.4, 0.3, 'bold italic', fontproperties=font, **alignment)
+font = FontProperties(style='italic', weight='bold', size='x-small')
+fig.text(0.3, 0.1, 'bold italic', fontproperties=font, **alignment)
+font = FontProperties(style='italic', weight='bold', size='medium')
+fig.text(0.3, 0.2, 'bold italic', fontproperties=font, **alignment)
+font = FontProperties(style='italic', weight='bold', size='x-large')
+fig.text(0.3, 0.3, 'bold italic', fontproperties=font, **alignment)
 
 plt.show()
diff --git a/examples/text_labels_and_annotations/fonts_demo_kw.py b/examples/text_labels_and_annotations/fonts_demo_kw.py
@@ -10,67 +10,47 @@
 
 import matplotlib.pyplot as plt
 
+fig = plt.figure()
 alignment = {'horizontalalignment': 'center', 'verticalalignment': 'baseline'}
+yp = [0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2]
 
 # Show family options
-
+fig.text(0.1, 0.9, 'family', size='large', **alignment)
 families = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
-
-t = plt.figtext(0.1, 0.9, 'family', size='large', **alignment)
-
-yp = [0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2]
-
 for k, family in enumerate(families):
-    t = plt.figtext(0.1, yp[k], family, family=family, **alignment)
+    fig.text(0.1, yp[k], family, family=family, **alignment)
 
 # Show style options
-
+fig.text(0.3, 0.9, 'style', **alignment)
 styles = ['normal', 'italic', 'oblique']
-
-t = plt.figtext(0.3, 0.9, 'style', **alignment)
-
 for k, style in enumerate(styles):
-    t = plt.figtext(0.3, yp[k], style, family='sans-serif', style=style,
-                    **alignment)
+    fig.text(0.3, yp[k], style, family='sans-serif', style=style, **alignment)
 
 # Show variant options
-
+fig.text(0.5, 0.9, 'variant', **alignment)
 variants = ['normal', 'small-caps']
-
-t = plt.figtext(0.5, 0.9, 'variant', **alignment)
-
 for k, variant in enumerate(variants):
-    t = plt.figtext(0.5, yp[k], variant, family='serif', variant=variant,
-                    **alignment)
+    fig.text(0.5, yp[k], variant, family='serif', variant=variant, **alignment)
 
 # Show weight options
-
+fig.text(0.7, 0.9, 'weight', **alignment)
 weights = ['light', 'normal', 'medium', 'semibold', 'bold', 'heavy', 'black']
-
-t = plt.figtext(0.7, 0.9, 'weight', **alignment)
-
 for k, weight in enumerate(weights):
-    t = plt.figtext(0.7, yp[k], weight, weight=weight, **alignment)
+    fig.text(0.7, yp[k], weight, weight=weight, **alignment)
 
 # Show size options
-
-sizes = ['xx-small', 'x-small', 'small', 'medium', 'large',
-         'x-large', 'xx-large']
-
-t = plt.figtext(0.9, 0.9, 'size', **alignment)
-
+fig.text(0.9, 0.9, 'size', **alignment)
+sizes = [
+    'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']
 for k, size in enumerate(sizes):
-    t = plt.figtext(0.9, yp[k], size, size=size, **alignment)
+    fig.text(0.9, yp[k], size, size=size, **alignment)
 
 # Show bold italic
-t = plt.figtext(0.3, 0.1, 'bold italic', style='italic',
-                weight='bold', size='x-small',
-                **alignment)
-t = plt.figtext(0.3, 0.2, 'bold italic',
-                style='italic', weight='bold', size='medium',
-                **alignment)
-t = plt.figtext(0.3, 0.3, 'bold italic',
-                style='italic', weight='bold', size='x-large',
-                **alignment)
+fig.text(0.3, 0.1, 'bold italic',
+         style='italic', weight='bold', size='x-small', **alignment)
+fig.text(0.3, 0.2, 'bold italic',
+         style='italic', weight='bold', size='medium', **alignment)
+fig.text(0.3, 0.3, 'bold italic',
+         style='italic', weight='bold', size='x-large', **alignment)
 
 plt.show()
