Merge pull request #17256 from anntzer/pspartialusetex

timhoffm · web-flow · commit 1f4803888114 · 2020-05-06T01:22:55.000+02:00
Improve ps handling of individual usetex strings.
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -469,6 +469,14 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
 
     def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
         # docstring inherited
+        if not hasattr(self, "psfrag"):
+            _log.warning(
+                "The PS backend determines usetex status solely based on "
+                "rcParams['text.usetex'] and does not support having "
+                "usetex=True only for some elements; this element will thus "
+                "be rendered as if usetex=False.")
+            self.draw_text(gc, x, y, s, prop, angle, ismath, mtext)
+            return
 
         w, h, bl = self.get_text_width_height_descent(s, prop, ismath)
         fontsize = prop.get_size_in_points()
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -117,10 +117,19 @@ def test_transparency():
 
 
 @needs_usetex
-def test_failing_latex(tmpdir):
+def test_failing_latex():
     """Test failing latex subprocess call"""
     mpl.rcParams['text.usetex'] = True
     # This fails with "Double subscript"
     plt.xlabel("$22_2_2$")
     with pytest.raises(RuntimeError):
-        plt.savefig(Path(tmpdir, "tmpoutput.ps"))
+        plt.savefig(io.BytesIO(), format="ps")
+
+
+@needs_usetex
+def test_partial_usetex(caplog):
+    caplog.set_level("WARNING")
+    plt.figtext(.5, .5, "foo", usetex=True)
+    plt.savefig(io.BytesIO(), format="ps")
+    assert caplog.records and all("as if usetex=False" in record.getMessage()
+                                  for record in caplog.records)
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -726,7 +726,7 @@ def draw(self, renderer):
                 if textobj.get_usetex():
                     textrenderer.draw_tex(gc, x, y, clean_line,
                                           textobj._fontproperties, angle,
-                                          mtext=mtext)
+                                          ismath=ismath, mtext=mtext)
                 else:
                     textrenderer.draw_text(gc, x, y, clean_line,
                                            textobj._fontproperties, angle,
