fixed a formatting bug in ticker.ScalarFormatter (10^0 was rendered as

ddale · ddale · commit 29130679d44d · 2007-07-16T14:06:59.000Z
10 in some cases)

svn path=/trunk/matplotlib/; revision=3539
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2007-07-16 fixed a formatting bug in ticker.ScalarFormatter's scientific 
+           notation (10^0 was being rendered as 10 in some cases) - DSD
+
 2007-07-13 Add MPL_isfinite64() and MPL_isinf64() for testing
            doubles in (the now misnamed) MPL_isnan.h. - ADS
 
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -402,27 +402,26 @@ def pprint_val(self, x):
         if absolute(xp) < 1e-8: xp = 0
         return self.format % xp
 
-    def _formatSciNotation(self,s, mathtext=False):
+    def _formatSciNotation(self, s, mathtext=False):
         # transform 1e+004 into 1e4, for example
         tup = s.split('e')
         try:
-            mantissa = tup[0].rstrip('0').rstrip('.')
+            significand = tup[0].rstrip('0').rstrip('.')
             sign = tup[1][0].replace('+', '')
             exponent = tup[1][1:].lstrip('0')
             if mathtext:
-                if self._usetex:
-                    if mantissa=='1':
-                        return r'10^{%s%s}'%(sign, exponent)
-                    else:
-                        return r'%s{\times}10^{%s%s}'%(mantissa, sign, exponent)
+                if significand == '1':
+                    # reformat 1x10^y as 10^y
+                    significand = ''
+                if exponent:
+                    exponent = '10^{%s%s}'%(sign, exponent)
+                if significand and exponent:
+                    return r'%s{\times}%s'%(significand, exponent)
                 else:
-                    if mantissa=='1':
-                        return r'10^{%s%s}'%(sign, exponent)
-                    else:
-                        return r'%s{\times}10^{%s%s}'%(mantissa, sign, exponent)
+                    return r'%s%s'%(significand, exponent)
             else:
-                return ('%se%s%s' %(mantissa, sign, exponent)).rstrip('e')
-        except IndexError,msg:
+                return ('%se%s%s' %(significand, sign, exponent)).rstrip('e')
+        except IndexError, msg:
             return s
 
 
