Merge pull request #11757 from stilley2/master

jklymak · web-flow · commit 68690fcac21e · 2018-07-23T17:21:06.000-07:00
PGF backend output text color even if black
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -470,3 +470,12 @@ Colorbar for log-scaled hexbin
 When using `hexbin` and plotting with a logarithmic color scale, the colorbar
 ticks are now correctly log scaled. Previously the tick values were linear
 scaled log(number of counts).
+
+PGF backend now explicitly makes black text black
+-------------------------------------------------
+
+Previous behavior with the pgf backend was for text specified as black to
+actually be the default color of whatever was rendering the pgf file (which was
+of course usually black). The new behavior is that black text is black,
+regardless of the default color. However, this means that there is no way to
+fall back on the default color of the renderer.
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -673,11 +673,10 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             writeln(self.fh, r"\pgfsetfillopacity{%f}" % alpha)
             writeln(self.fh, r"\pgfsetstrokeopacity{%f}" % alpha)
         rgb = tuple(gc.get_rgb())[:3]
-        if rgb != (0, 0, 0):
-            writeln(self.fh, r"\definecolor{textcolor}{rgb}{%f,%f,%f}" % rgb)
-            writeln(self.fh, r"\pgfsetstrokecolor{textcolor}")
-            writeln(self.fh, r"\pgfsetfillcolor{textcolor}")
-            s = r"\color{textcolor}" + s
+        writeln(self.fh, r"\definecolor{textcolor}{rgb}{%f,%f,%f}" % rgb)
+        writeln(self.fh, r"\pgfsetstrokecolor{textcolor}")
+        writeln(self.fh, r"\pgfsetfillcolor{textcolor}")
+        s = r"\color{textcolor}" + s
 
         f = 1.0 / self.figure.dpi
         text_args = []
