Try [strings] option for underscore pkg

kir0ul · kir0ul · commit 3832a4bae586 · 2021-07-27T02:30:11.000-04:00
diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
@@ -102,7 +102,7 @@ def test_usetex_packages(pkg):
 
 @pytest.mark.parametrize(
     "latex_statement",
-    [r"\usepackage[full]{textcomp}", r"\usepackage[strings]{underscore}"],
+    [r"\usepackage[full]{textcomp}", r"\usepackage{underscore}"],
 )
 def test_latex_pkg_already_loaded(latex_statement):
     plt.rcParams["text.latex.preamble"] = latex_statement
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -176,7 +176,7 @@ def _get_preamble(self):
             self.get_custom_preamble(),
             # Use `underscore` package to take care of underscores in text
             r"\makeatletter"
-            r"\@ifpackageloaded{underscore}{}{\usepackage{underscore}}"
+            r"\@ifpackageloaded{underscore}{}{\usepackage[strings]{underscore}}"
             r"\makeatother",
             # textcomp is loaded last (if not already loaded by the custom
             # preamble) in order not to clash with custom packages (e.g.

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ def test_usetex_packages(pkg):`
`102`	`102`
`103`	`103`	`@pytest.mark.parametrize(`
`104`	`104`	`"latex_statement",`
`105`		`- [r"\usepackage[full]{textcomp}", r"\usepackage[strings]{underscore}"],`
	`105`	`+ [r"\usepackage[full]{textcomp}", r"\usepackage{underscore}"],`
`106`	`106`	`)`
`107`	`107`	`def test_latex_pkg_already_loaded(latex_statement):`
`108`	`108`	`plt.rcParams["text.latex.preamble"] = latex_statement`