Update fonts_demo

jenshnielsen · jenshnielsen · commit 38fbda6fad71 · 2014-11-16T10:07:21.000Z
Print all text within figure and remove missing cursive text
diff --git a/examples/pylab_examples/fonts_demo.py b/examples/pylab_examples/fonts_demo.py
@@ -14,77 +14,75 @@
 alignment = {'horizontalalignment': 'center', 'verticalalignment': 'baseline'}
 # Show family options
 
-family = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
+families = ['serif', 'sans-serif', 'cursive', 'fantasy', 'monospace']
 
 font1 = font0.copy()
 font1.set_size('large')
 
 t = text(-0.8, 0.9, 'family', fontproperties=font1,
          **alignment)
 
-yp = [0.7, 0.5, 0.3, 0.1, -0.1, -0.3, -0.5]
+yp = [0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2]
 
-for k in range(5):
+for k, family in enumerate(families):
     font = font0.copy()
-    font.set_family(family[k])
-    if k == 2:
-        font.set_name('Script MT')
-    t = text(-0.8, yp[k], family[k], fontproperties=font,
+    font.set_family(family)
+    t = text(-0.8, yp[k], family, fontproperties=font,
              **alignment)
 
 # Show style options
 
-style = ['normal', 'italic', 'oblique']
+styles = ['normal', 'italic', 'oblique']
 
 t = text(-0.4, 0.9, 'style', fontproperties=font1,
          **alignment)
 
-for k in range(3):
+for k, style in enumerate(styles):
     font = font0.copy()
     font.set_family('sans-serif')
-    font.set_style(style[k])
-    t = text(-0.4, yp[k], style[k], fontproperties=font,
+    font.set_style(style)
+    t = text(-0.4, yp[k], style, fontproperties=font,
              **alignment)
 
 # Show variant options
 
-variant = ['normal', 'small-caps']
+variants = ['normal', 'small-caps']
 
 t = text(0.0, 0.9, 'variant', fontproperties=font1,
          **alignment)
 
-for k in range(2):
+for k, variant in enumerate(variants):
     font = font0.copy()
     font.set_family('serif')
-    font.set_variant(variant[k])
-    t = text(0.0, yp[k], variant[k], fontproperties=font,
+    font.set_variant(variant)
+    t = text(0.0, yp[k], variant, fontproperties=font,
              **alignment)
 
 # Show weight options
 
-weight = ['light', 'normal', 'medium', 'semibold', 'bold', 'heavy', 'black']
+weights = ['light', 'normal', 'medium', 'semibold', 'bold', 'heavy', 'black']
 
 t = text(0.4, 0.9, 'weight', fontproperties=font1,
          **alignment)
 
-for k in range(7):
+for k, weight in enumerate(weights):
     font = font0.copy()
-    font.set_weight(weight[k])
-    t = text(0.4, yp[k], weight[k], fontproperties=font,
+    font.set_weight(weight)
+    t = text(0.4, yp[k], weight, fontproperties=font,
              **alignment)
 
 # Show size options
 
-size = ['xx-small', 'x-small', 'small', 'medium', 'large',
-        'x-large', 'xx-large']
+sizes = ['xx-small', 'x-small', 'small', 'medium', 'large',
+         'x-large', 'xx-large']
 
 t = text(0.8, 0.9, 'size', fontproperties=font1,
          **alignment)
 
-for k in range(7):
+for k, size in enumerate(sizes):
     font = font0.copy()
-    font.set_size(size[k])
-    t = text(0.8, yp[k], size[k], fontproperties=font,
+    font.set_size(size)
+    t = text(0.8, yp[k], size, fontproperties=font,
              **alignment)
 
 # Show bold italic
@@ -93,21 +91,21 @@
 font.set_style('italic')
 font.set_weight('bold')
 font.set_size('x-small')
-t = text(0, 0.1, 'bold italic', fontproperties=font,
+t = text(-0.4, 0.1, 'bold italic', fontproperties=font,
          **alignment)
 
 font = font0.copy()
 font.set_style('italic')
 font.set_weight('bold')
 font.set_size('medium')
-t = text(0, 0.2, 'bold italic', fontproperties=font,
+t = text(-0.4, 0.2, 'bold italic', fontproperties=font,
          **alignment)
 
 font = font0.copy()
 font.set_style('italic')
 font.set_weight('bold')
 font.set_size('x-large')
-t = text(0, 0.3, 'bold italic', fontproperties=font,
+t = text(-0.4, 0.3, 'bold italic', fontproperties=font,
          **alignment)
 
 axis([-1, 1, 0, 1])
