Revision: 6874
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6874&view=rev
Author: mdboom
Date: 2009-02-04 13:37:24 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
Merged revisions 6861,6873 via svnmerge from
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)
........
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/doc/users/customizing.rst
trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
trunk/matplotlib/lib/matplotlib/_mathtext_data.py
trunk/matplotlib/lib/matplotlib/mathtext.py
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6859
+ /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6873
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2009-02-04 13:22:35 UTC (rev 6873)
+++ trunk/matplotlib/CHANGELOG 2009-02-04 13:37:24 UTC (rev 6874)
@@ -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
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859
+
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873
Modified: trunk/matplotlib/doc/users/customizing.rst
===================================================================
--- trunk/matplotlib/doc/users/customizing.rst 2009-02-04 13:22:35 UTC (rev
6873)
+++ trunk/matplotlib/doc/users/customizing.rst 2009-02-04 13:37:24 UTC (rev
6874)
@@ -27,7 +27,13 @@
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>`.
.. _customizing-with-dynamic-rc-settings:
Modified: trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
2009-02-04 13:22:35 UTC (rev 6873)
+++ trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
2009-02-04 13:37:24 UTC (rev 6874)
@@ -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}$',
Modified: trunk/matplotlib/lib/matplotlib/_mathtext_data.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/_mathtext_data.py 2009-02-04 13:22:35 UTC
(rev 6873)
+++ trunk/matplotlib/lib/matplotlib/_mathtext_data.py 2009-02-04 13:37:24 UTC
(rev 6874)
@@ -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,
Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py 2009-02-04 13:22:35 UTC (rev
6873)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py 2009-02-04 13:37:24 UTC (rev
6874)
@@ -2037,7 +2037,7 @@
\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 @@
+ (group | Error("Expected \sqrt{value}"))
).setParseAction(self.sqrt).setName("sqrt")
- placeable <<(accent
- ^ function
+ placeable <<(function
^ (c_over_c | symbol)
+ ^ accent
^ group
^ frac
^ sqrt
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
