releasing 0.73

svn path=/trunk/matplotlib/; revision=1085

Author: jdh2358

MANIFEST

@@ -384,6 +384,7 @@ examples/data/ct.raw
 examples/data/eeg.dat
 examples/data/embedding_in_wx3.xrc
 examples/data/intc.csv
+examples/data/lena.jpg
 examples/data/membrane.dat
 examples/data/msft.csv
 examples/data/s1045.ima

TODO

@@ -671,4 +671,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- colorbar image origin with contour is broken in SVG; test PS
 
--- Bryan Cole's CXX type segfault
+-- Bryan Cole's CXX type segfault
+
+-- japanese ft2font bug

lib/matplotlib/font_manager.py

@@ -179,7 +179,9 @@ def findSystemFonts(fontpaths=None, fontext='ttf'):
     elif isinstance(fontpaths, (str, unicode)):
         fontpaths = [fontpaths]
     for path in fontpaths:
-        for fname in glob.glob(os.path.join(path, '*.'+fontext)):
+        files = glob.glob(os.path.join(path, '*.'+fontext))
+        files.extend(glob.glob(os.path.join(path, '*.'+fontext.upper())))
+        for fname in files:
 
             fontfiles[os.path.abspath(fname)] = 1
     return [fname for fname in fontfiles.keys() if os.path.exists(fname)]
@@ -767,6 +769,7 @@ def __init__(self, size=12.0, weight='normal'):
 
         self.ttffiles = findSystemFonts(paths) + findSystemFonts()
         for fname in self.ttffiles:
+            verbose.report('trying fontname %s' % fname, 'debug')
             if fname.lower().find('vera.ttf')>=0:
                 self.defaultFont = fname
                 break

lib/matplotlib/legend.py

@@ -349,6 +349,7 @@ def get_tbounds(text):  #get text bounds in axes coords
 
         # Set the data for the legend patch
         bbox = self._get_handle_text_bbox(renderer).deepcopy()
+
         bbox.scale(1 + self.pad, 1 + self.pad)
         l,b,w,h = bbox.get_bounds()
         self.legendPatch.set_bounds(l,b,w,h)

src/_backend_agg.cpp

@@ -1161,10 +1161,10 @@ RendererAgg::_draw_markers(const Py::Tuple& args) {
     while(!agg::is_stop(cmd = ppath->vertex(&x, &y)))
       markers.add_vertex(x+thisx, thisy-y, cmd);
 
-    
+    _fill_and_stroke(markers, gc, face, curvy);    
   } //for each marker
 
-  _fill_and_stroke(markers, gc, face, curvy);
+
   Py_XDECREF(xa);
   Py_XDECREF(ya);
 

src/ft2font.cpp

@@ -351,7 +351,20 @@ FT2Font::FT2Font(std::string facefile)
 
   setattr("postscript_name", Py::String(ps_name));
   setattr("num_faces",       Py::Int(face->num_faces));
-  setattr("family_name",     Py::String(face->family_name));
+
+  std::cout << "trying to set string " << facefile << std::endl;
+  try {
+    Py::String s(face->family_name, "utf-16", NULL);
+  }
+  catch (...) { //todo; catch specific exception and figure out unicode
+    std::cout << "oops, exception" << std::endl;
+    std::ostringstream s;
+    s << "Could not access facename for facefile " << facefile << " may be unicode limitation" << std::endl;
+    throw Py::RuntimeError(s.str());
+  }
+  std::cout << "done trying to set string" << std::endl;  
+
+  setattr("family_name",     Py::String(face->family_name);
   setattr("style_name",      Py::String(face->style_name));
   setattr("face_flags",      Py::Int(face->face_flags));
   setattr("style_flags",     Py::Int(face->style_flags));