figure/subplot and font_manager bugfixes

jdh2358 · jdh2358 · commit 077fb39b821c · 2008-12-11T01:10:35.000Z
svn path=/trunk/matplotlib/; revision=6559
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2008-12-10 Added Michael's font_manager fix and Jae-Joon's
+           figure/subplot fix.  Bumped version number to 0.98.5 - JDH
+
 =================================================================                                                                      2008-12-09 Released 0.98.4 at svn r6536
 
 2008-12-08 Added mdehoon's native macosx backend from sf patch 2179017 - JDH
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -89,7 +89,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.98.4'
+__version__  = '0.98.5rc'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -676,21 +676,21 @@ def add_subplot(self, *args, **kwargs):
 
             projection_class = get_projection_class(projection)
 
-        key = self._make_key(*args, **kwargs)
-        if key in self._seen:
-            ax = self._seen[key]
-            if isinstance(ax, projection_class):
-                self.sca(ax)
-                return ax
-            else:
-                self.axes.remove(ax)
-                self._axstack.remove(ax)
-
-        a = subplot_class_factory(projection_class)(self, *args, **kwargs)
+            key = self._make_key(*args, **kwargs)
+            if key in self._seen:
+                ax = self._seen[key]
+                if isinstance(ax, projection_class):
+                    self.sca(ax)
+                    return ax
+                else:
+                    self.axes.remove(ax)
+                    self._axstack.remove(ax)
+
+            a = subplot_class_factory(projection_class)(self, *args, **kwargs)
+            self._seen[key] = a
         self.axes.append(a)
         self._axstack.push(a)
         self.sca(a)
-        self._seen[key] = a
         return a
     add_subplot.__doc__ = dedent(add_subplot.__doc__) % {
         'list': ", ".join(get_projection_names()),
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1068,7 +1068,7 @@ def score_family(self, families, family2):
                 options = rcParams['font.' + family1]
                 if family2 in options:
                     idx = options.index(family2)
-                    return 0.1
+                    return 0.1 * (float(idx) / len(options))
             elif family1.lower() == family2.lower():
                 return 0.0
         return 1.0
