Merge branch 'ticker-mathtext' of https://github.com/ddale/matplotlib into ddale-ticker-mathtext

efiring · efiring · commit e0a8e9e0c0c4 · 2012-06-24T10:16:31.000-10:00
Conflicts:
	CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2012-06-24 Make use of mathtext in tick labels configurable - DSD
+
 2012-06-05 Images loaded through PIL are now ordered correctly - CG
 
 2012-06-02 Add new Axes method and pyplot function, hist2d. - PO
@@ -63,10 +65,8 @@
 2011-12-29 ps and pdf markers are now stroked only if the line width
            is nonzero for consistency with agg, fixes issue #621. - JKS
 
-
 2011-12-27 Work around an EINTR bug in some versions of subprocess. - JKS
 
-
 2011-10-25 added support for \operatorname to mathtext,
            including the ability to insert spaces, such as
            $\operatorname{arg\,max}$ - PI
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -466,7 +466,9 @@ def __call__(self, s):
                                # use scientific notation if log10
                                # of the axis range is smaller than the
                                # first or larger than the second
-    'axes.formatter.use_locale' : [False, validate_bool], # Use the current locale to format ticks
+    'axes.formatter.use_locale' : [False, validate_bool],
+                               # Use the current locale to format ticks
+    'axes.formatter.use_mathtext' : [False, validate_bool],
     'axes.unicode_minus'        : [True, validate_bool],
     'axes.color_cycle'      : [['b','g','r','c','m','y','k'],
                                     validate_colorlist], # cycle of plot
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -330,21 +330,22 @@ class ScalarFormatter(Formatter):
 
     """
 
-    def __init__(self, useOffset=True, useMathText=False, useLocale=None):
+    def __init__(self, useOffset=True, useMathText=None, useLocale=None):
         # useOffset allows plotting small data ranges with large offsets:
         # for example: [1+1e-9,1+2e-9,1+3e-9]
         # useMathText will render the offset and scientific notation in mathtext
         self.set_useOffset(useOffset)
         self._usetex = rcParams['text.usetex']
+        if useMathText is None:
+            useMathText = rcParams['axes.formatter.use_mathtext']
         self._useMathText = useMathText
         self.orderOfMagnitude = 0
         self.format = ''
         self._scientific = True
         self._powerlimits = rcParams['axes.formatter.limits']
         if useLocale is None:
-            self._useLocale = rcParams['axes.formatter.use_locale']
-        else:
-            self._useLocale = useLocale
+            useLocale = rcParams['axes.formatter.use_locale']
+        self._useLocale = useLocale
 
     def get_useOffset(self):
         return self._useOffset
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -231,6 +231,8 @@ text.hinting_factor : 8 # Specifies the amount of softness for hinting in the
                                    # according to the user's locale.
                                    # For example, use ',' as a decimal
                                    # separator in the fr_FR locale.
+#axes.formatter.use_mathtext : False # When True, use mathtext for scientific
+                                     # notation.
 #axes.unicode_minus  : True    # use unicode for the minus symbol
                                # rather than hyphen.  See
                                # http://en.wikipedia.org/wiki/Plus_and_minus_signs#Character_codes
