Merge pull request #18507 from anntzer/fewertexpacks

story645 · web-flow · commit 11043264d6b4 · 2020-09-17T14:48:37.000-04:00
Fewer "soft" dependencies on LaTeX packages.
diff --git a/examples/userdemo/pgf_preamble_sgskip.py b/examples/userdemo/pgf_preamble_sgskip.py
@@ -13,18 +13,16 @@
     "text.usetex": True,     # use inline math for ticks
     "pgf.rcfonts": False,    # don't setup fonts from rc parameters
     "pgf.preamble": "\n".join([
-         "\\usepackage{units}",          # load additional packages
-         "\\usepackage{metalogo}",
-         "\\usepackage{unicode-math}",   # unicode math setup
-         r"\setmathfont{xits-math.otf}",
+         r"\usepackage{url}",            # load additional packages
+         r"\usepackage{unicode-math}",   # unicode math setup
          r"\setmainfont{DejaVu Serif}",  # serif font via preamble
     ])
 })
 
 plt.figure(figsize=(4.5, 2.5))
 plt.plot(range(5))
-plt.xlabel("unicode text: я, ψ, €, ü, \\unitfrac[10]{°}{µm}")
-plt.ylabel("\\XeLaTeX")
+plt.xlabel("unicode text: я, ψ, €, ü")
+plt.ylabel(r"\url{https://matplotlib.org}")
 plt.legend(["unicode math: $λ=∑_i^∞ μ_i^2$"])
 plt.tight_layout(.5)
 
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -112,16 +112,20 @@ text.usetex         : False  # use latex for all text handling. The following fo
                              # LaTeX \usepackage command, please inquire at the
                              # matplotlib mailing list
 text.latex.preamble :  # IMPROPER USE OF THIS FEATURE WILL LEAD TO LATEX FAILURES
-                           # AND IS THEREFORE UNSUPPORTED. PLEASE DO NOT ASK FOR HELP
-                           # IF THIS FEATURE DOES NOT DO WHAT YOU EXPECT IT TO.
-                           # preamble is a comma separated list of LaTeX statements
-                           # that are included in the LaTeX document preamble.
-                           # An example:
-                           # text.latex.preamble : \usepackage{bm},\usepackage{euler}
-                           # The following packages are always loaded with usetex, so
-                           # beware of package collisions: color, geometry, graphicx,
-                           # type1cm, textcomp. Adobe Postscript (PSSNFS) font packages
-                           # may also be loaded, depending on your font settings
+                       # AND IS THEREFORE UNSUPPORTED. PLEASE DO NOT ASK FOR HELP
+                       # IF THIS FEATURE DOES NOT DO WHAT YOU EXPECT IT TO.
+                       # text.latex.preamble is a single line of LaTeX code that
+                       # will be passed on to the LaTeX system. It may contain
+                       # any code that is valid for the LaTeX "preamble", i.e.
+                       # between the "\documentclass" and "\begin{document}"
+                       # statements.
+                       # Note that it has to be put on a single line, which may
+                       # become quite long.
+                       # The following packages are always loaded with usetex, so
+                       # beware of package collisions: color, geometry, graphicx,
+                       # type1cm, textcomp.
+                       # Adobe Postscript (PSSNFS) font packages may also be
+                       # loaded, depending on your font settings.
 
 text.hinting : auto   # May be one of the following:
                       #   'none': Perform no hinting
