SF.net SVN: matplotlib: [5091] trunk/matplotlib

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

Revision: 5091
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5091&view=rev
Author:   mdboom
Date:     2008-04-28 07:19:06 -0700 (Mon, 28 Apr 2008)

Log Message:
-----------
Merged revisions 5069-5090 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint

........
  r5088 | mdboom | 2008-04-28 09:07:41 -0400 (Mon, 28 Apr 2008) | 2 lines
  
  Fix SVG text rendering bug affecting Mozilla-based viewers.
........
  r5089 | mdboom | 2008-04-28 09:41:28 -0400 (Mon, 28 Apr 2008) | 3 lines
  
  Fix bug where fraction beams were too wide at lower dpi's.  Fix
  sub/superscript placement at different dpi's.
........
  r5090 | mdboom | 2008-04-28 09:49:50 -0400 (Mon, 28 Apr 2008) | 2 lines
  
  Oops in last commit -- left in debugging info.
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/backends/backend_svg.py
    trunk/matplotlib/lib/matplotlib/mathtext.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/v0_91_maint:1-5068
   + /branches/v0_91_maint:1-5090

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-04-28 13:49:50 UTC (rev 5090)
+++ trunk/matplotlib/CHANGELOG	2008-04-28 14:19:06 UTC (rev 5091)
@@ -1,3 +1,6 @@
+2008-04-28 Fix bug in SVG text with Mozilla-based viewers (the symbol
+           tag is not supported) - MGD
+
 2008-04-27 Applied patch by Michiel de Hoon to add hexbin
            axes method and pyplot function - EF
 
@@ -11,6 +14,7 @@
 2008-04-24 Fix compilation issues on VS2003 (Thanks Martin Spacek for
            all the help) - MGD
 
+>>>>>>> .merge-right.r5090
 2008-04-24 Fix sub/superscripts when the size of the font has been
            changed - MGD
 

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_svg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_svg.py	2008-04-28 13:49:50 UTC (rev 5090)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_svg.py	2008-04-28 14:19:06 UTC (rev 5091)
@@ -401,7 +401,7 @@
                 currx, curry = step[-2], -step[-1]
         path_data = ''.join(path_data)
         char_num = 'c_%s' % md5.new(path_data).hexdigest()
-        path_element = '<symbol id="%s"><path d="%s"/></symbol>\n' % (char_num, ''.join(path_data))
+        path_element = '<path id="%s" d="%s"/>\n' % (char_num, ''.join(path_data))
         self._char_defs[char_id] = char_num
         return path_element
 

Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py	2008-04-28 13:49:50 UTC (rev 5090)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py	2008-04-28 14:19:06 UTC (rev 5091)
@@ -651,12 +651,12 @@
             # Some fonts don't store the xHeight, so we do a poor man's xHeight
             metrics = self.get_metrics(font, 'it', 'x', fontsize, dpi)
             return metrics.iceberg
-        xHeight = (pclt['xHeight'] / 64.0) * (fontsize / 12.0)
+        xHeight = (pclt['xHeight'] / 64.0) * (fontsize / 12.0) * (dpi / 100.0)
         return xHeight
 
     def get_underline_thickness(self, font, fontsize, dpi):
         cached_font = self._get_font(font)
-        return max(1.0, cached_font.font.underline_thickness / 64.0 / fontsize * 10.0)
+        return cached_font.font.underline_thickness / 64.0 / fontsize * (10.0 * dpi / 100.0)
 
     def get_kern(self, font1, fontclass1, sym1, fontsize1,
                  font2, fontclass2, sym2, fontsize2, dpi):


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