Merge pull request matplotlib#19795 from anntzer/untex

Remove usetex-related APIs deprecated in Matplotlib 3.3.

Author: timhoffm

doc/api/next_api_changes/deprecations/19795-AL.rst

@@ -0,0 +1,3 @@
+``Dvi.baseline``
+~~~~~~~~~~~~~~~~
+... is deprecated (with no replacement).

doc/api/next_api_changes/removals/19795-AL.rst

@@ -0,0 +1,11 @@
+usetex-related removals
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``text.latex.preview`` rcParam and associated methods
+(``TexManager.make_tex_preview``, ``TexManager.make_dvi_preview``) have been
+removed.
+
+The ``cachedir``, ``rgba_arrayd``, ``serif``, ``sans_serif``, ``cursive``, and
+``monospace`` attributes of ``TexManager`` have been removed.
+
+``dviread.Encoding`` has been removed.

examples/text_labels_and_annotations/usetex_baseline_test.py

@@ -3,76 +3,24 @@
 Usetex Baseline Test
 ====================
 
-A test for :rc:`text.latex.preview`, a deprecated feature which relied
-on the preview.sty LaTeX package to properly align TeX baselines.  This
-feature has been deprecated as Matplotlib's dvi parser now computes baselines
-just as well as preview.sty; this example will be removed together with
-:rc:`text.latex.preview` after the deprecation elapses.
+Comparison of text baselines computed for mathtext and usetex.
 """
 
 import matplotlib.pyplot as plt
-import matplotlib.axes as maxes
 
 
 plt.rcParams.update({"mathtext.fontset": "cm", "mathtext.rm": "serif"})
-
-
-@maxes.subplot_class_factory
-class LatexPreviewSubplot(maxes.Axes):
-    """
-    A hackish way to simultaneously draw texts with text.latex.preview=True and
-    text.latex.preview=False in the same figure.  It does not work with the ps
-    backend.
-    """
-
-    def __init__(self, *args, preview=False, **kwargs):
-        self.preview = preview
-        super().__init__(*args, **kwargs)
-
-    def draw(self, renderer):
-        from matplotlib import _api  # internal, *do not use*
-        with _api.suppress_matplotlib_deprecation_warning():
-            with plt.rc_context({"text.latex.preview": self.preview}):
-                super().draw(renderer)
-
-
-def test_window_extent(ax, usetex, preview):
-
-    ax.xaxis.set_visible(False)
-    ax.yaxis.set_visible(False)
-
-    test_strings = ["lg", r"$\frac{1}{2}\pi$",
-                    r"$p^{3^A}$", r"$p_{3_2}$"]
-
+axs = plt.figure(figsize=(2 * 3, 6.5)).subplots(1, 2)
+for ax, usetex in zip(axs, [False, True]):
     ax.axvline(0, color="r")
-
+    test_strings = ["lg", r"$\frac{1}{2}\pi$", r"$p^{3^A}$", r"$p_{3_2}$"]
     for i, s in enumerate(test_strings):
         ax.axhline(i, color="r")
         ax.text(0., 3 - i, s,
                 usetex=usetex,
                 verticalalignment="baseline",
                 size=50,
                 bbox=dict(pad=0, ec="k", fc="none"))
-
-    ax.set_xlim(-0.1, 1.1)
-    ax.set_ylim(-.8, 3.9)
-
-    title = f"usetex={usetex}\n"
-    if usetex:
-        title += f"preview={preview}"
-    ax.set_title(title)
-
-
-fig = plt.figure(figsize=(2 * 3, 6.5))
-
-for i, usetex, preview in [[0, False, False],
-                           [1, True, False],
-                           [2, True, True]]:
-    ax = LatexPreviewSubplot(fig, 1, 3, i + 1, preview=preview)
-    fig.add_subplot(ax)
-    fig.subplots_adjust(top=0.85)
-
-    test_window_extent(ax, usetex=usetex, preview=preview)
-
-
+    ax.set(xlim=(-0.1, 1.1), ylim=(-.8, 3.9), xticks=[], yticks=[],
+           title=f"usetex={usetex}\n")
 plt.show()

lib/matplotlib/__init__.py

@@ -553,7 +553,6 @@ def gen_candidates():
     'animation.avconv_args': ('3.3',),
     'animation.html_args': ('3.3',),
     'savefig.jpeg_quality': ('3.3',),
-    'text.latex.preview': ('3.3',),
 }
 
 

lib/matplotlib/backends/backend_ps.py

@@ -570,19 +570,11 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
         s = fontcmd % s
         tex = r'\color[rgb]{%s} %s' % (color, s)
 
-        corr = 0  # w/2*(fontsize-10)/10
-        if dict.__getitem__(mpl.rcParams, 'text.latex.preview'):
-            # use baseline alignment!
-            pos = _nums_to_str(x-corr, y)
-            self.psfrag.append(
-                r'\psfrag{%s}[Bl][Bl][1][%f]{\fontsize{%f}{%f}%s}' % (
-                    thetext, angle, fontsize, fontsize*1.25, tex))
-        else:
-            # Stick to the bottom alignment.
-            pos = _nums_to_str(x-corr, y-bl)
-            self.psfrag.append(
-                r'\psfrag{%s}[bl][bl][1][%f]{\fontsize{%f}{%f}%s}' % (
-                    thetext, angle, fontsize, fontsize*1.25, tex))
+        # Stick to the bottom alignment.
+        pos = _nums_to_str(x, y-bl)
+        self.psfrag.append(
+            r'\psfrag{%s}[bl][bl][1][%f]{\fontsize{%f}{%f}%s}' % (
+                thetext, angle, fontsize, fontsize*1.25, tex))
 
         self._pswriter.write(f"""\
 gsave

lib/matplotlib/dviread.py

@@ -30,7 +30,7 @@
 
 import numpy as np
 
-from matplotlib import _api, cbook, rcParams
+from matplotlib import _api, cbook
 
 _log = logging.getLogger(__name__)
 
@@ -212,15 +212,8 @@ def __init__(self, filename, dpi):
         self.dpi = dpi
         self.fonts = {}
         self.state = _dvistate.pre
-        self.baseline = self._get_baseline(filename)
-
-    def _get_baseline(self, filename):
-        if dict.__getitem__(rcParams, 'text.latex.preview'):
-            baseline = Path(filename).with_suffix(".baseline")
-            if baseline.exists():
-                height, depth, width = baseline.read_bytes().split()
-                return float(depth)
-        return None
+
+    baseline = _api.deprecated("3.5")(property(lambda self: None))
 
     def __enter__(self):
         """Context manager enter method, does nothing."""
@@ -290,10 +283,7 @@ def _output(self):
 
         # convert from TeX's "scaled points" to dpi units
         d = self.dpi / (72.27 * 2**16)
-        if self.baseline is None:
-            descent = (maxy - maxy_pure) * d
-        else:
-            descent = self.baseline
+        descent = (maxy - maxy_pure) * d
 
         text = [Text((x-minx)*d, (maxy-y)*d - descent, f, g, w*d)
                 for (x, y, f, g, w) in self.text]
@@ -960,55 +950,6 @@ def _parse(self, file):
                 encoding=encoding, filename=filename)
 
 
-@_api.deprecated("3.3")
-class Encoding:
-    r"""
-    Parse a \*.enc file referenced from a psfonts.map style file.
-
-    The format this class understands is a very limited subset of PostScript.
-
-    Usage (subject to change)::
-
-      for name in Encoding(filename):
-          whatever(name)
-
-    Parameters
-    ----------
-    filename : str or path-like
-
-    Attributes
-    ----------
-    encoding : list
-        List of character names
-    """
-    __slots__ = ('encoding',)
-
-    def __init__(self, filename):
-        with open(filename, 'rb') as file:
-            _log.debug('Parsing TeX encoding %s', filename)
-            self.encoding = self._parse(file)
-            _log.debug('Result: %s', self.encoding)
-
-    def __iter__(self):
-        yield from self.encoding
-
-    @staticmethod
-    def _parse(file):
-        lines = (line.split(b'%', 1)[0].strip() for line in file)
-        data = b''.join(lines)
-        beginning = data.find(b'[')
-        if beginning < 0:
-            raise ValueError("Cannot locate beginning of encoding in {}"
-                             .format(file))
-        data = data[beginning:]
-        end = data.find(b']')
-        if end < 0:
-            raise ValueError("Cannot locate end of encoding in {}"
-                             .format(file))
-        data = data[:end]
-        return re.findall(br'/([^][{}<>\s]+)', data)
-
-
 # Note: this function should ultimately replace the Encoding class, which
 # appears to be mostly broken: because it uses b''.join(), there is no
 # whitespace left between glyph names (only slashes) so the final re.findall

lib/matplotlib/rcsetup.py

@@ -1086,7 +1086,6 @@ def _convert_validator_spec(key, conv):
     "text.color":          validate_color,
     "text.usetex":         validate_bool,
     "text.latex.preamble": _validate_tex_preamble,
-    "text.latex.preview":  validate_bool,
     "text.hinting":        _validate_hinting,
     "text.hinting_factor": validate_int,
     "text.kerning_factor": validate_int,
@@ -1422,7 +1421,6 @@ def _convert_validator_spec(key, conv):
     "animation.avconv_args": [],
     "animation.html_args": [],
     "savefig.jpeg_quality": 95,
-    "text.latex.preview": False,
 }
 _validators = {k: _convert_validator_spec(k, conv)
                for k, conv in _validators.items()}