Merged revisions 4506-4561 via svnmerge from

mdboom · mdboom · commit e5408fb9d51b · 2007-12-03T15:27:33.000Z
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib ........ r4507 | jdh2358 | 2007-11-29 15:16:48 -0500 (Thu, 29 Nov 2007) | 2 lines Applied Ludwigs build tkagg w/o x11 server patch ........ r4509 | jdh2358 | 2007-11-29 17:19:26 -0500 (Thu, 29 Nov 2007) | 2 lines commited ludwigs axes3d patch ........ r4512 | cmoad | 2007-11-29 21:40:30 -0500 (Thu, 29 Nov 2007) | 1 line minor rev bump ........ r4513 | cmoad | 2007-11-29 21:41:01 -0500 (Thu, 29 Nov 2007) | 1 line minor rev bump ........ r4514 | cmoad | 2007-11-29 21:47:06 -0500 (Thu, 29 Nov 2007) | 1 line minor rev bump ........ r4515 | cmoad | 2007-11-29 22:42:35 -0500 (Thu, 29 Nov 2007) | 1 line CXX/WrapPython.h missing from MANIFEST ........ r4516 | cmoad | 2007-11-29 23:00:16 -0500 (Thu, 29 Nov 2007) | 1 line ttconv missing from MANFEST ........ r4517 | cmoad | 2007-11-29 23:09:48 -0500 (Thu, 29 Nov 2007) | 1 line added setup.cfg.template ........ r4532 | mdboom | 2007-11-30 14:48:41 -0500 (Fri, 30 Nov 2007) | 2 lines Fix mathtext in example. ........ r4537 | astraw | 2007-12-01 15:12:05 -0500 (Sat, 01 Dec 2007) | 2 lines Fix loading of AAPL data in get_two_stock_data() ........ r4557 | mdboom | 2007-12-03 08:20:19 -0500 (Mon, 03 Dec 2007) | 2 lines Fix missing font file error. ........ r4560 | jdh2358 | 2007-12-03 10:23:32 -0500 (Mon, 03 Dec 2007) | 2 lines fixed a gtk import else block in mlab ........ r4561 | mdboom | 2007-12-03 10:23:47 -0500 (Mon, 03 Dec 2007) | 3 lines Remove paragraph about MATPLOTLIBDATA environment variable, since it doesn't really apply anymore. ........ svn path=/branches/transforms/; revision=4562
diff --git a/API_CHANGES b/API_CHANGES
@@ -169,6 +169,8 @@ TRANSFORMS REFACTORING
 
 END OF TRANSFORMS REFACTORING
 
+0.91.1 Released
+
 0.91.0 Released
 
     Changed cbook.is_file_like to cbook.is_writable_file_like and
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+===============================================================
+2007-11-27 Released 0.91.1 at revision 4517
+
 ===============================================================
 2007-11-27 Released 0.91.0 at revision 4478
 
diff --git a/CODING_GUIDE b/CODING_GUIDE
@@ -117,7 +117,7 @@ python, C and C++
 
 
 
-for older versions of emacs (emacs<22) you may need to do
+for older versions of emacs (emacs<22) you need to do
 
 (add-hook 'python-mode-hook
           (lambda ()
diff --git a/INSTALL b/INSTALL
@@ -14,7 +14,7 @@ INTRODUCTION
   more.  If you want to produce PNGs or GUI images that support all of
   matplotlib's features, you should compile matplotlib with agg
   support and use one of the GUI agg backends: GTKAgg, WXAgg, TkAgg or
-  FLTKAgg.   
+  FLTKAgg.
 
 COMPILING
 
@@ -36,7 +36,7 @@ COMPILING
   As discussed above, most users will want to set 'BUILD_AGG = 1' and
   one or more of the GUI backends to True.  Exceptions to this are if
   you know you don't need a GUI (eg a web server) or you only want to
-  produce vector graphics. 
+  produce vector graphics.
 
   If you have installed prerequisites to nonstandard places and need
   to inform matplotlib where they are, edit setupext.py an add the
@@ -53,16 +53,12 @@ COMPILING
   with matplotlib, it is important that you have *both* present and in
   your PYTHONPATH when you compile matplotlib.
 
-  Note that if you install matplotlib anywhere other than the default
-  location, you will need to set the MATPLOTLIBDATA environment
-  variable to point to the install base dir.
- 
   Once you have everything above set to your liking, just do the usual
   thing
 
       python setup.py build
       python setup.py install
-    
+
 WINDOWS
 
   If you don't already have python installed, you may want to consider
@@ -106,7 +102,7 @@ DISTROS: (rpms, apt, fink, osx, freebsd, gentoo, etc)
     To build all the backends on a binary linux distro such as redhat,
     you need to install a number of the devel libs (and whatever
     dependencies they require), I suggest
- 
+
       matplotlib core: zlib, zlib-devel, libpng, libpng-devel,
                        freetype, freetype-devel, freetype-utils
 
@@ -134,7 +130,7 @@ DISTROS: (rpms, apt, fink, osx, freebsd, gentoo, etc)
     http://www.freshports.org/math/py-matplotlib/
 
   Gentoo
- 
+
     http://www.gentoo-portage.com/dev-python/matplotlib
 
   OS X
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
 include API_CHANGES CHANGELOG KNOWN_BUGS INSTALL NUMARRAY_ISSUES
 include INTERACTIVE TODO
 include Makefile  MANIFEST.in MANIFEST
-include matplotlibrc.template matplotlibrc
+include matplotlibrc.template matplotlibrc setup.cfg.template
 include __init__.py setupext.py setup.py setupegg.py makeswig.py
 include examples/data/*
 include lib/matplotlib/toolkits
@@ -12,7 +12,8 @@ recursive-include license LICENSE*
 recursive-include examples README *.py
 prune examples/_tmp_*
 recursive-include src  *.cpp *.c *.h
-recursive-include CXX  *.cxx *.hxx *.c
+recursive-include CXX  *.cxx *.hxx *.c *.h
 recursive-include agg23 *
 recursive-include lib *
 recursive-include swig *
+recursive-include ttconv *.cpp *.h
diff --git a/examples/data_helper.py b/examples/data_helper.py
@@ -15,7 +15,7 @@ def get_two_stock_data():
     M1 = resize(M1, (M1.shape[0]/2,2) )
 
     M2 = fromstring( file('data/%s.dat' % ticker2, 'rb').read(), '<d')
-    M2 = resize(M1, (M2.shape[0]/2,2) )
+    M2 = resize(M2, (M2.shape[0]/2,2) )
 
     d1, p1 = M1[:,0], M1[:,1]
     d2, p2 = M2[:,0], M2[:,1]
diff --git a/examples/loadrec.py b/examples/loadrec.py
@@ -2,6 +2,7 @@
 from pylab import figure, show
 
 a = mlab.csv2rec('data/msft.csv')
+a.sort()
 print a.dtype
 
 fig = figure()
diff --git a/examples/text_themes.py b/examples/text_themes.py
@@ -17,7 +17,7 @@ def f(t):
 
 plot(t1, f(t1), 'bo', t2, f(t2), 'k')
 title('Damped exponential decay', font, size='large', color='r')
-text(2, 0.65, 'cos(2 pi t) exp(-t)', font, color='k', family='monospace' )
+text(2, 0.65, r'$\cos(2 \pi t) \exp(-t)$', color='k')
 xlabel('time (s)', font, style='italic')
 ylabel('voltage (mV)', font)
 
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -55,7 +55,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.91.0'
+__version__  = '0.91.1'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
diff --git a/lib/matplotlib/axes3d.py b/lib/matplotlib/axes3d.py
@@ -313,9 +313,10 @@ def get_proj(self):
 
     def mouse_init(self):
         self.button_pressed = None
-        self.figure.canvas.mpl_connect('motion_notify_event', self.on_move)
-        self.figure.canvas.mpl_connect('button_press_event', self.button_press)
-        self.figure.canvas.mpl_connect('button_release_event', self.button_release)
+        if self.figure.canvas != None:
+            self.figure.canvas.mpl_connect('motion_notify_event', self.on_move)
+            self.figure.canvas.mpl_connect('button_press_event', self.button_press)
+            self.figure.canvas.mpl_connect('button_release_event', self.button_release)
 
     def button_press(self, event):
         self.button_pressed = event.button
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -16,7 +16,18 @@
 
   s = r'$\mathcal{R}\prod_{i=\alpha\mathcal{B}}^\infty a_i\sin(2 \pi f x_i)$'
 
-  The fonts \cal, \rm, \it, and \tt are allowed.
+  Different fonts may be selected:
+    \mathcal      Calligraphic fonts
+    \mathrm       Roman (upright) font
+    \mathit       Italic font
+    \mathtt       Typewriter (monospaced) font, similar to Courier
+
+  Additionally, if using the STIX fonts:
+    \mathbb       Blackboard (double-struck) font
+    \mathcircled  Circled characters
+    \mathfrak     Fraktur (Gothic-style) font
+    \mathscr      Script (cursive) font
+    \mathsf       Sans-serif font
 
   The following accents are provided: \hat, \breve, \grave, \bar,
   \acute, \tilde, \vec, \dot, \ddot.  All of them have the same
@@ -539,10 +550,7 @@ def _get_font(self, font):
 
         cached_font = self._fonts.get(basename)
         if cached_font is None:
-            try:
-                font = FT2Font(basename)
-            except RuntimeError:
-                return None
+            font = FT2Font(basename)
             cached_font = self.CachedFont(font)
             self._fonts[basename] = cached_font
             self._fonts[font.postscript_name] = cached_font
@@ -650,13 +658,20 @@ def _get_glyph(self, fontname, font_class, sym, fontsize):
         if fontname in self.fontmap and latex_to_bakoma.has_key(sym):
             basename, num = latex_to_bakoma[sym]
             slanted = (basename == "cmmi10") or sym in self._slanted_symbols
-            cached_font = self._get_font(basename)
-            symbol_name = cached_font.font.get_glyph_name(num)
-            num = cached_font.glyphmap[num]
+            try:
+                cached_font = self._get_font(basename)
+            except RuntimeError:
+                pass
+            else:
+                symbol_name = cached_font.font.get_glyph_name(num)
+                num = cached_font.glyphmap[num]
         elif len(sym) == 1:
             slanted = (fontname == "it")
-            cached_font = self._get_font(fontname)
-            if cached_font is not None:
+            try:
+                cached_font = self._get_font(fontname)
+            except RuntimeError:
+                pass
+            else:
                 num = ord(sym)
                 gid = cached_font.charmap.get(num)
                 if gid is not None:
@@ -793,9 +808,12 @@ def _get_glyph(self, fontname, font_class, sym, fontsize):
                     new_fontname = 'rm'
 
             slanted = (new_fontname == 'it') or sym in self._slanted_symbols
-            cached_font = self._get_font(new_fontname)
             found_symbol = False
-            if cached_font is not None:
+            try:
+                cached_font = self._get_font(new_fontname)
+            except RuntimeError:
+                pass
+            else:
                 try:
                     glyphindex = cached_font.charmap[uniindex]
                     found_symbol = True
diff --git a/setupext.py b/setupext.py
