matplotlib
diff --git a/‎CHANGELOG‎
Lines changed: 1 addition & 1 deletion b/‎CHANGELOG‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎examples/dashpointlabel.py‎
Lines changed: 40 additions & 0 deletions b/‎examples/dashpointlabel.py‎
Lines changed: 40 additions & 0 deletions
diff --git a/‎lib/matplotlib/axes.py‎
Lines changed: 20 additions & 5 deletions b/‎lib/matplotlib/axes.py‎
Lines changed: 20 additions & 5 deletions
@@ -16,7 +16,7 @@ New entries should be added at the top
 2005-05-27 Fixed bug where 2nd wxapp could be started if using wxagg
            backend. - ADS
 
-2005-05-26 Added Daisha text with dash patch -- see examples/dashtick.py
+2005-05-26 Added Daishi text with dash patch -- see examples/dashtick.py
 
 2005-05-26 Moved backend_latex functionality into backend_ps. If 
            text.usetex=True, the PostScript backend will use LaTeX to 
 
@@ -0,0 +1,40 @@
+from matplotlib import pylab
+
+DATA = ((1, 3),
+        (2, 4),
+        (3, 1),
+        (4, 2))
+# dash_style =
+#     direction, length, (text)rotation, dashrotation, push
+# (The parameters are varied to show their effects,
+# not for visual appeal).
+dash_style = (
+    (0, 20, -15, 30, 10),
+    (1, 30, 0, 15, 10),
+    (0, 40, 15, 15, 10),
+    (1, 20, 30, 60, 10),
+    )
+
+def test_dashpointlabel(save=False):
+    pylab.clf()
+    (x,y) = zip(*DATA)
+    pylab.plot(x, y, marker='o')
+    for i in xrange(len(DATA)):
+        (x,y) = DATA[i]
+        (dd, dl, r, dr, dp) = dash_style[i]
+        pylab.text(x, y, str((x,y)), withdash=True,
+                   dashdirection=dd,
+                   dashlength=dl,
+                   rotation=r,
+                   dashrotation=dr,
+                   dashpush=dp,
+                   )
+    axis = pylab.gca()
+    axis.set_xlim((0.0, 5.0))
+    axis.set_ylim((0.0, 5.0))
+    if save:
+        pylab.savefig('dashpointlabel')
+    pylab.show()
+
+if __name__ == '__main__':
+    test_dashpointlabel()
@@ -35,7 +35,7 @@
 from matplotlib import rcParams
 from patches import Patch, Rectangle, Circle, Polygon, Arrow, Wedge, Shadow, bbox_artist
 from table import Table
-from text import Text, _process_text_args
+from text import Text, TextWithDash, _process_text_args
 from transforms import Bbox, Point, Value, Affine, NonseparableTransformation
 from transforms import  FuncXY, Func, LOG10, IDENTITY, POLAR
 from transforms import get_bbox_transform, unit_bbox, one, origin, zero
@@ -3403,7 +3403,8 @@ def table(self,
         return table
 
 
-    def text(self, x, y, s, fontdict=None, **kwargs):
+    def text(self, x, y, s, fontdict=None,
+             withdash=False, **kwargs):
         """
         TEXT(x, y, s, fontdict=None, **kwargs)
 
@@ -3413,6 +3414,9 @@ def text(self, x, y, s, fontdict=None, **kwargs):
           If fontdict is None, the defaults are determined by your rc
           parameters.
 
+          withdash=True will create a TextWithDash instance instead
+          of a Text instance.
+
         Individual keyword arguemnts can be used to override any given
         parameter
 
@@ -3437,9 +3441,20 @@ def text(self, x, y, s, fontdict=None, **kwargs):
             'transform' : self.transData,
             }
 
-        t = Text(
-            x=x, y=y, text=s,
-            )
+        # At some point if we feel confident that TextWithDash
+        # is robust as a drop-in replacement for Text and that
+        # the performance impact of the heavier-weight class
+        # isn't too significant, it may make sense to eliminate
+        # the withdash kwarg and simply delegate whether there's
+        # a dash to TextWithDash and dashlength.
+        if withdash:
+            t = TextWithDash(
+                x=x, y=y, text=s,
+                )
+        else:
+            t = Text(
+                x=x, y=y, text=s,
+                )
         self._set_artist_props(t)
 
         t.update(default)