Merged revisions 6861,6873 via svnmerge from

mdboom · mdboom · commit 8bd9a99029a9 · 2009-02-04T13:37:24.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6861 | mdboom | 2009-01-30 11:31:47 -0500 (Fri, 30 Jan 2009) | 2 lines Document how to find the currently active matplotlibrc file. ........ r6873 | mdboom | 2009-02-04 08:22:35 -0500 (Wed, 04 Feb 2009) | 2 lines Fix bug in mathtext related to \dots and \ldots (Thanks, Fernando Perez) ........ svn path=/trunk/matplotlib/; revision=6874
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2009-02-04 Fix bug in mathtext related to \dots and \ldots - MGD
+
 2009-02-03 Change default joinstyle to round - MGD
 
 2009-02-02 Reduce number of marker XObjects in pdf output - JKS
diff --git a/doc/users/customizing.rst b/doc/users/customizing.rst
@@ -27,6 +27,12 @@ locations, in the following order:
    customizations to be saved, please move this file to you :file:`.matplotlib`
    directory.
 
+To display where the currently active :file:`matplotlibrc` file was
+loaded from, one can do the following::
+
+  >>> import matplotlib
+  >>> matplotlib.matplotlib_fname()
+  '/home/foo/.matplotlib/matplotlibrc'
 
 See below for a sample :ref:`matplotlibrc file<matplotlibrc-sample>`.
 
diff --git a/examples/pylab_examples/mathtext_examples.py b/examples/pylab_examples/mathtext_examples.py
@@ -5,6 +5,7 @@
 import gc
 
 stests = [
+    r'$a+b+\dots+\dot{s}+\ldots$',
     r'$x \doteq y$',
     r'\$100.00 $\alpha \_$',
     r'$\frac{\$100.00}{y}$',
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -1805,7 +1805,7 @@
 'Game': 0x2141,
 'hbar': 0x0127,
 'hslash': 0x210f,
-'ldots': 0x22ef,
+'ldots': 0x2026,
 'vdots': 0x22ee,
 'doteqdot': 0x2251,
 'doteq': 8784,
@@ -2100,7 +2100,7 @@
 'propto': 8733,
 'pi': 960,
 'pm': 177,
-'dots': 8230,
+'dots': 0x2026,
 'nrightarrow': 8603,
 'textasciiacute': 180,
 'Doteq': 8785,
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2037,7 +2037,7 @@ class Parser(object):
       \sqsubset       \sqsupset        \neq             \smile
       \sqsubseteq     \sqsupseteq      \doteq           \frown
       \in             \ni              \propto
-      \vdash          \dashv'''.split())
+      \vdash          \dashv           \dots'''.split())
 
     _arrow_symbols = set(r'''
       \leftarrow              \longleftarrow           \uparrow
@@ -2180,9 +2180,9 @@ def __init__(self):
                      + (group | Error("Expected \sqrt{value}"))
                      ).setParseAction(self.sqrt).setName("sqrt")
 
-        placeable   <<(accent
-                     ^ function
+        placeable   <<(function
                      ^ (c_over_c | symbol)
+                     ^ accent
                      ^ group
                      ^ frac
                      ^ sqrt

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2009-02-04 Fix bug in mathtext related to \dots and \ldots - MGD`
	`2`	`+`
`1`	`3`	`2009-02-03 Change default joinstyle to round - MGD`
`2`	`4`
`3`	`5`	`2009-02-02 Reduce number of marker XObjects in pdf output - JKS`