backend_pgf: use the bounding box as clip rectangle (fixes #2586)

pwuertz · pwuertz · commit 2c84d107aa14 · 2013-12-18T17:18:55.000+01:00
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -799,7 +799,7 @@ def _print_pgf_to_fh(self, fh, *args, **kwargs):
         writeln(fh, r"\makeatletter")
         writeln(fh, r"\begin{pgfpicture}")
         writeln(fh, r"\pgfpathrectangle{\pgfpointorigin}{\pgfqpoint{%fin}{%fin}}" % (w, h))
-        writeln(fh, r"\pgfusepath{use as bounding box}")
+        writeln(fh, r"\pgfusepath{use as bounding box, clip}")
         _bbox_inches_restore = kwargs.pop("bbox_inches_restore", None)
         renderer = MixedModeRenderer(self.figure, w, h, dpi,
                                      RendererPgf(self.figure, fh),
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_bbox_inches.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_bbox_inches.pdf
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -58,9 +58,9 @@ def backend_switcher(*args, **kwargs):
     return switch_backend_decorator
 
 
-def compare_figure(fname):
+def compare_figure(fname, savefig_kwargs={}):
     actual = os.path.join(result_dir, fname)
-    plt.savefig(actual)
+    plt.savefig(actual, **savefig_kwargs)
 
     expected = os.path.join(result_dir, "expected_%s" % fname)
     shutil.copyfile(os.path.join(baseline_dir, fname), expected)
@@ -168,6 +168,24 @@ def test_mixedmode():
     compare_figure('pgf_mixedmode.pdf')
 
 
+# test bbox_inches clipping
+@switch_backend('pgf')
+def test_bbox_inches():
+    if not check_for('xelatex'):
+        raise SkipTest('xelatex + pgf is required')
+
+    Y, X = np.ogrid[-1:1:40j, -1:1:40j]
+    fig = plt.figure()
+    ax1 = fig.add_subplot(121)
+    ax1.plot(range(5))
+    ax2 = fig.add_subplot(122)
+    ax2.plot(range(5))
+    plt.tight_layout()
+
+    bbox = ax1.get_window_extent().transformed(fig.dpi_scale_trans.inverted())
+    compare_figure('pgf_bbox_inches.pdf', savefig_kwargs={'bbox_inches': bbox})
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
