SF.net SVN: matplotlib:[6555] branches/v0_98_4_maint/matplotlib

[<md...@us...>]

Revision: 6555
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6555&view=rev
Author:   mdboom
Date:     2008-12-10 23:25:50 +0000 (Wed, 10 Dec 2008)

Log Message:
-----------
Fix problem with prioritization of font names

Modified Paths:
--------------
    branches/v0_98_4_maint/matplotlib/CHANGELOG
    branches/v0_98_4_maint/matplotlib/lib/matplotlib/font_manager.py

Modified: branches/v0_98_4_maint/matplotlib/CHANGELOG
===================================================================
--- branches/v0_98_4_maint/matplotlib/CHANGELOG	2008-12-10 21:12:26 UTC (rev 6554)
+++ branches/v0_98_4_maint/matplotlib/CHANGELOG	2008-12-10 23:25:50 UTC (rev 6555)
@@ -1,5 +1,9 @@
-=================================================================                                                                      2008-12-09 Released 0.98.4 at svn r6536
+2008-12-10 Fix problem specifying more than one concrete font family
+name - MGD
 
+=================================================================
+2008-12-09 Released 0.98.4 at svn r6536
+
 2008-12-08 Added mdehoon's native macosx backend from sf patch 2179017 - JDH
 
 2008-12-08 Removed the prints in the set_*style commands.  Return the

Modified: branches/v0_98_4_maint/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- branches/v0_98_4_maint/matplotlib/lib/matplotlib/font_manager.py	2008-12-10 21:12:26 UTC (rev 6554)
+++ branches/v0_98_4_maint/matplotlib/lib/matplotlib/font_manager.py	2008-12-10 23:25:50 UTC (rev 6555)
@@ -1068,7 +1068,7 @@
                 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.