Merged revisions 3885-3895 via svnmerge from

mdboom · mdboom · commit 97bd353a1247 · 2007-09-26T13:55:41.000Z
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib ........ r3894 | mdboom | 2007-09-26 09:41:15 -0400 (Wed, 26 Sep 2007) | 3 lines Bugfix: Display exponents in tick values in the default font (not the default math font) ........ svn path=/branches/transforms/; revision=3896
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -1855,7 +1855,7 @@ def __init__(self):
                              "tanh")
 
         fontname     = oneOf("rm cal it tt sf bf")
-        latex2efont  = oneOf("mathrm mathcal mathit mathtt mathsf mathbf")
+        latex2efont  = oneOf("mathrm mathcal mathit mathtt mathsf mathbf mathdefault")
 
         space        =(FollowedBy(bslash)
                      +   (Literal(r'\ ')
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -300,9 +300,12 @@ def get_offset(self):
                     sciNotStr = r'{\times}'+self.format_data(10**self.orderOfMagnitude)
                 else:
                     sciNotStr = u'\xd7'+'1e%d'% self.orderOfMagnitude
-            if self._useMathText or self._usetex:
+            if self._useMathText:
+                return ''.join(('$\mathdefault{',sciNotStr,offsetStr,'}$'))
+            elif self._usetex:
                 return ''.join(('$',sciNotStr,offsetStr,'$'))
-            else: return ''.join((sciNotStr,offsetStr))
+            else:
+                return ''.join((sciNotStr,offsetStr))
         else: return ''
 
     def set_locs(self, locs):
@@ -363,8 +366,11 @@ def _set_format(self):
                    for loc in locs]
         sigfigs.sort()
         self.format = '%1.' + str(sigfigs[-1]) + 'f'
-        if self._usetex or self._useMathText: self.format = '$%s$'%self.format
-
+        if self._usetex:
+            self.format = '$%s$' % self.format
+        elif self._useMathText:
+            self.format = '$\mathdefault{%s}$' % self.format
+            
     def pprint_val(self, x):
         xp = (x-self.offset)/10**self.orderOfMagnitude
         if npy.absolute(xp) < 1e-8: xp = 0
@@ -511,11 +517,13 @@ def __call__(self, x, pos=None):
         elif not isDecade:
             if usetex:
                 s = r'$%d^{%.2f}$'% (b, fx)
-            else: s = '$%d^{%.2f}$'% (b, fx)
+            else:
+                s = '$\mathdefault{%d^{%.2f}}$'% (b, fx)
         else:
             if usetex:
                 s = r'$%d^{%d}$'% (b, self.nearest_long(fx))
-            else: s = r'$%d^{%d}$'% (b, self.nearest_long(fx))
+            else:
+                s = r'$\mathdefault{%d^{%d}}$'% (b, self.nearest_long(fx))
 
         return s
 
