Merged revisions 5312-5313,5329 via svnmerge from

jdh2358 · jdh2358 · commit c00862bfc376 · 2008-05-30T19:38:42.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint ........ r5312 | cmoad | 2008-05-29 15:59:43 -0700 (Thu, 29 May 2008) | 1 line tagging new version ........ r5313 | cmoad | 2008-05-29 20:07:39 -0700 (Thu, 29 May 2008) | 1 line minor rev bump ........ r5329 | jdh2358 | 2008-05-30 12:21:56 -0700 (Fri, 30 May 2008) | 1 line added support for None for dvipng and removed the sqrt in the hack which I think is wrong ........ svn path=/trunk/matplotlib/; revision=5333
diff --git a/MIGRATION.txt b/MIGRATION.txt
@@ -31,7 +31,7 @@ To check out the trunk with the latest transforms changes:
 If you already have a working copy of the trunk, your next "svn up" will
 include the latest transforms changes.  
 
-Before installing, make sure you completely remove the old matplotlib
+IMPORTANT: Before installing, make sure you completely remove the old matplotlib
 build and install directories, eg: 
 
     > cd matplotlib
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -43,6 +43,16 @@ def validate_bool(b):
     else:
         raise ValueError('Could not convert "%s" to boolean' % b)
 
+def validate_bool_maybe_none(b):
+    'Convert b to a boolean or raise'
+    if type(b) is str:
+        b = b.lower()
+    if b=='none': return None
+    if b in ('t', 'y', 'yes', 'on', 'true', '1', 1, True): return True
+    elif b in ('f', 'n', 'no', 'off', 'false', '0', 0, False): return False
+    else:
+        raise ValueError('Could not convert "%s" to boolean' % b)
+
 def validate_float(s):
     'convert s to float or raise'
     try: return float(s)
@@ -338,7 +348,7 @@ def __call__(self, s):
     'text.usetex'         : [False, validate_bool],
     'text.latex.unicode'  : [False, validate_bool],
     'text.latex.preamble' : [[''], validate_stringlist],
-    'text.dvipnghack'     : [False, validate_bool],
+    'text.dvipnghack'     : [None, validate_bool_maybe_none],
     'text.fontstyle'      : ['normal', str],
     'text.fontangle'      : ['normal', str],
     'text.fontvariant'    : ['normal', str],
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -366,7 +366,12 @@ def get_grey(self, tex, fontsize=None, dpi=None):
             pngfile = self.make_png(tex, fontsize, dpi)
             X = readpng(os.path.join(self.texcache, pngfile))
 
-            if self._dvipng_hack_alpha or rcParams['text.dvipnghack']:
+            if rcParams['text.dvipnghack'] is not None:
+                hack = rcParams['text.dvipnghack']
+            else:
+                hack = self._dvipng_hack_alpha
+            print 'using hack', hack
+            if hack:
                 # hack the alpha channel
                 # dvipng assumed a constant background, whereas we want to
                 # overlay these rasters with antialiasing over arbitrary
@@ -388,7 +393,8 @@ def get_grey(self, tex, fontsize=None, dpi=None):
                 #
                 # Since the foreground is black (0) and the background is
                 # white (1) this reduces to red = 1-alpha or alpha = 1-red
-                alpha = np.sqrt(1-X[:,:,0])
+                #alpha = npy.sqrt(1-X[:,:,0]) # should this be sqrt here?
+                alpha = 1-X[:,:,0]
             else:
                 alpha = X[:,:,-1]
 
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -147,9 +147,14 @@ numerix      : %(numerix)s  # numpy, Numeric or numarray
                             # beware of package collisions: color, geometry, graphicx,
                             # type1cm, textcomp. Adobe Postscript (PSSNFS) font packages
                             # may also be loaded, depending on your font settings
-#text.dvipnghack     : False  # some versions of dvipng don't handle
-                             # alpha channel properly.  Use True to correct and flush
-                             # ~/.matplotlib/tex.cache before testing
+
+#text.dvipnghack : None      # some versions of dvipng don't handle alpha
+                             # channel properly.  Use True to correct
+                             # and flush ~/.matplotlib/tex.cache
+                             # before testing and False to force
+                             # correction off.  None will try and
+                             # guess based on your dvipng version
+
 #text.markup         : 'plain'  # Affects how text, such as titles and labels, are
                                 # interpreted by default.
                                 # 'plain': As plain, unformatted text
