adjusted spacing for fonts demos

jdh2358 · jdh2358 · commit 21a69ff964af · 2004-06-25T14:27:17.000Z
svn path=/trunk/matplotlib/; revision=365
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,9 @@
 New entries should be added at the top
 =======
 
+2004-06-25 Fixed fonts_demo spacing problems and added a kwargs
+           version of the fonts_demo fonts_demo_kw.py - JDH
+
 2004-06-25 finance.py: handle case when urlopen() fails - SC
 
 2004-06-24 Support for multiple images on axes and figure, with
@@ -34,7 +37,8 @@ New entries should be added at the top
 
 2004-06-15 removed set_default_font from font_manager to unify font
            customization using the new function rc.  See API_CHANGES
-           fpr more info -  JDH
+           for more info.  The examples fonts_demo.py and
+           fonts_demo_kw.py are ported to the new API - JDH
 
 2004-06-15 Improved (yet again!) axis scaling to properly handle
            singleton plots - JDH
diff --git a/examples/fonts_demo.py b/examples/fonts_demo.py
@@ -1,5 +1,10 @@
 #!/usr/bin/env python
+"""
+Show how to set custom font properties.
 
+For interactive users, you can also use kwargs to the text command,
+which requires less typing.  See exampes/fonts_demo_kw.py
+"""
 from matplotlib.font_manager import fontManager, FontProperties
 from matplotlib.matlab import *
 
@@ -45,14 +50,14 @@
 
 variant= ['normal', 'small-caps']
 
-t = text(0.2, 0.9, 'variant', fontproperties=font1,
+t = text(0.0, 0.9, 'variant', fontproperties=font1,
          **alignment)
 
 for k in range(1):
     font = font0.copy()
     font.set_family('serif')
     font.set_variant(variant[k])
-    t = text( 0.2, yp[k], variant[k], fontproperties=font,
+    t = text( 0.0, yp[k], variant[k], fontproperties=font,
              **alignment)
 
 ###  Show weight options
@@ -83,26 +88,27 @@
              **alignment)
 
 ###  Show bold italic
-left = 0.1
+
 font = font0.copy()
 font.set_style('italic')
 font.set_weight('bold')
 font.set_size('x-small')
-t = text(left, 0.1, 'bold italic', fontproperties=font,
+t = text(0, 0.1, 'bold italic', fontproperties=font,
          **alignment)
 
 font = font0.copy()
 font.set_style('italic')
 font.set_weight('bold')
 font.set_size('medium')
-t = text(left, 0.2, 'bold italic', fontproperties=font,
+t = text(0, 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(left, 0.3, 'bold italic', fontproperties=font,
+t = text(0, 0.3, 'bold italic', fontproperties=font,
          **alignment)
 
+axis([-1,1,0,1])
 show()
diff --git a/examples/fonts_demo_kw.py b/examples/fonts_demo_kw.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 """
-Same as fonts_demo using kwargs
+Same as fonts_demo using kwargs.  If you prefer a more pythonic, OO
+style of coding, see examples/fonts_demo.py.
+
 """
 from matplotlib.font_manager import fontManager, FontProperties
 from matplotlib.matlab import *
@@ -36,10 +38,10 @@
 
 variant= ['normal', 'small-caps']
 
-t = text(0.2, 0.9, 'variant', **alignment)
+t = text(0.0, 0.9, 'variant', **alignment)
 
 for k in range(1):
-    t = text( 0.2, yp[k], variant[k], family='serif', variant=variant[k],
+    t = text( 0.0, yp[k], variant[k], family='serif', variant=variant[k],
               **alignment)
 
 ###  Show weight options
@@ -63,19 +65,19 @@
     t = text( 0.8, yp[k], size[k], size=size[k],
              **alignment)
 
-left = 0.1
+x = 0
 ###  Show bold italic
-t = text(left, 0.1, 'bold italic', style='italic',
+t = text(x, 0.1, 'bold italic', style='italic',
          weight='bold', size='x-small',    
          **alignment)
 
-t = text(left, 0.2, 'bold italic',
+t = text(x, 0.2, 'bold italic',
          style = 'italic', weight='bold', size='medium',
          **alignment)
 
-t = text(left, 0.3, 'bold italic',
+t = text(x, 0.3, 'bold italic',
          style='italic', weight='bold', size='x-large',
          **alignment)
 
-
+axis([-1, 1, 0, 1])
 show()
