Merge pull request #17569 from anntzer/delay-tc

tacaswell · web-flow · commit 7930213f9fb9 · 2020-06-17T12:23:10.000-04:00
FIX: Delay \usepackage{textcomp} until after the custom tex preamble.
diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
@@ -77,3 +77,10 @@ def test_minus_no_descent():
         heights[vals] = ((np.array(fig.canvas.buffer_rgba())[..., 0] != 255)
                          .any(axis=1).sum())
     assert len({*heights.values()}) == 1
+
+
+def test_textcomp_full():
+    plt.rcParams["text.latex.preamble"] = r"\usepackage[full]{textcomp}"
+    fig = plt.figure()
+    fig.text(.5, .5, "hello, world", usetex=True)
+    fig.canvas.draw()
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -154,8 +154,7 @@ def get_font_config(self):
                self._fonts['monospace'][1]]
         if self.font_family == 'cursive':
             cmd.append(self._fonts['cursive'][1])
-        self._font_preamble = '\n'.join(
-            [r'\usepackage{type1cm}', *cmd, r'\usepackage{textcomp}'])
+        self._font_preamble = '\n'.join([r'\usepackage{type1cm}', *cmd])
 
         return ''.join(fontconfig)
 
@@ -188,10 +187,16 @@ def _get_preamble(self):
             self._font_preamble,
             r"\usepackage[utf8]{inputenc}",
             r"\DeclareUnicodeCharacter{2212}{\ensuremath{-}}",
-            # Needs to come early so that the custom preamble can change the
-            # geometry, e.g. in convert_psfrags.
+            # geometry is loaded before the custom preamble as convert_psfrags
+            # relies on a custom preamble to change the geometry.
             r"\usepackage[papersize=72in,body=70in,margin=1in]{geometry}",
             self.get_custom_preamble(),
+            # textcomp is loaded last (if not already loaded by the custom
+            # preamble) in order not to clash with custom packages (e.g.
+            # newtxtext) which load it with different options.
+            r"\makeatletter"
+            r"\@ifpackageloaded{textcomp}{}{\usepackage{textcomp}}"
+            r"\makeatother",
         ])
 
     def make_tex(self, tex, fontsize):
