Merge pull request #3017 from pwuertz/fix_3000

tacaswell · tacaswell · commit 96f87f9cf3fa · 2014-05-16T08:47:22.000-04:00
Do not provide (wrong) mtext instances for pre-layouted text blocks (fixes #3000)
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2014-05-16 Fixed the positioning of multi-line text in the PGF backend.
+
 2014-05-14 Added Axes.add_image() as the standard way to add AxesImage
            instances to Axes. This improves the consistency with
            add_artist(), add_collection(), add_container(), add_line(),
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -651,7 +651,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
 
         f = 1.0 / self.figure.dpi
         text_args = []
-        if angle == 0 or mtext.get_rotation_mode() == "anchor":
+        if mtext and (angle == 0 or mtext.get_rotation_mode() == "anchor"):
             # if text anchoring can be supported, get the original coordinates
             # and add alignment information
             x, y = mtext.get_transform().transform_point(mtext.get_position())
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -1005,7 +1005,7 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
             style['font-style'] = prop.get_style().lower()
             attrib['style'] = generate_css(style)
 
-            if angle == 0 or mtext.get_rotation_mode() == "anchor":
+            if mtext and (angle == 0 or mtext.get_rotation_mode() == "anchor"):
                 # If text anchoring can be supported, get the original
                 # coordinates and add alignment information.
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -564,6 +564,7 @@ def draw(self, renderer):
             if not np.isfinite(x) or not np.isfinite(y):
                 continue
 
+            mtext = self if len(info) == 1 else None
             x = x + posx
             y = y + posy
             if renderer.flipy():
@@ -577,11 +578,11 @@ def draw(self, renderer):
 
             if rcParams['text.usetex']:
                 renderer.draw_tex(gc, x, y, clean_line,
-                                  self._fontproperties, angle, mtext=self)
+                                  self._fontproperties, angle, mtext=mtext)
             else:
                 renderer.draw_text(gc, x, y, clean_line,
                                    self._fontproperties, angle,
-                                   ismath=ismath, mtext=self)
+                                   ismath=ismath, mtext=mtext)
 
         gc.restore()
         renderer.close_group('text')

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2014-05-16 Fixed the positioning of multi-line text in the PGF backend.`
	`2`	`+`
`1`	`3`	`2014-05-14 Added Axes.add_image() as the standard way to add AxesImage`
`2`	`4`	`instances to Axes. This improves the consistency with`
`3`	`5`	`add_artist(), add_collection(), add_container(), add_line(),`