Fixed review comments and a few more removals

oscargus · oscargus · commit 08d76e0a67c0 · 2022-01-07T19:56:24.000+01:00
diff --git a/doc/api/next_api_changes/removals/22107-OG.rst b/doc/api/next_api_changes/removals/22107-OG.rst
@@ -1,44 +1,40 @@
 Removal of deprecated ``mathtext`` APIs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following :mod:`.mathtext` APIs have been removed:
-``MathtextBackendBitmap``,
-``MathtextBackendPs``,
-``MathtextBackendPdf``,
-``MathtextBackendSvg``,
-``MathtextBackendCairo``,
-``ship``,
-``Fonts``,
-``TruetypeFonts``,
-``StandardPsFonts``,
-``FontConstantsBase``,
-``ComputerModernFontConstants``,
-``STIXFontConstants``,
-``STIXSansFontConstants``,
-``DejaVuSerifFontConstants``,
-``DejaVuSansFontConstants``,
-``FontConstantsBase``,
-``Node``,
-``Box``,
-``Char``,
-``Glue``,
-``Kern``,
-``Ship``,
-``Parser``,
-``SHRINK_FACTOR``,
-``GROW_FACTOR``,
-``NUM_SIZE_LEVELS``,
-``latex_to_bakoma``,
-``latex_to_cmex``,
-``latex_to_standard``,
-``stix_virtual_fonts``, and
-``tex2uni``
+The following `matplotlib.mathtext` APIs have been removed:
+- ``Fonts`` and all its subclasses,
+- ``FontConstantsBase`` and all its subclasses,
+- ``Node`` and all its subclasses,
+- ``Ship``, ``ship``,
+- ``Error``,
+- ``Parser``,
+- ``SHRINK_FACTOR``, ``GROW_FACTOR``,
+- ``NUM_SIZE_LEVELS``,
+- ``latex_to_bakoma``, ``latex_to_cmex``, ``latex_to_standard``,
+- ``stix_virtual_fonts``,
+- ``tex2uni``
 
-The methods ``to_mask``, ``to_rgba``, ``to_png``, and ``get_depth`` of
-``MathTextParser`` have been removed. Use ``mathtext.math_to_image`` instead.
+Removal of various ``mathtext`` helpers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following `matplotlib.mathtext` classes:
+- ``MathtextBackendPdf``,
+- ``MathtextBackendPs``,
+- ``MathtextBackendSvg``,
+- ``MathtextBackendCairo``,
+and the ``.mathtext_parser`` attributes on
+- `.RendererPdf`,
+- `.RendererPS`,
+- `.RendererSVG`,
+- `.RendererCairo`
+have been removed. The `.MathtextBackendPath` class can be used instead.
+
+The methods ``get_depth``, ``parse``, ``to_mask``, ``to_rgba``, and ``to_png``
+of `.MathTextParser` have been removed. Use `.mathtext.math_to_image` instead.
+
+The unused ``StandardPsFonts.pswriter`` has been removed.
 
-The named keyword argument ``_force_standard_ps_fonts`` of
-``MathTextParser.parse`` has been removed.
+``ps.useafm`` removed for ``mathtext``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following :mod:.`_mathtext` APIs have been removed:
-``Fonts.destroy()``, ``TruetypeFonts.destroy()``, and ``StandardPsFonts.pswriter()``
+The setting :rc:`ps.useafm` no longer has any effect on `matplotlib.mathtext`.
diff --git a/doc/sphinxext/math_symbol_table.py b/doc/sphinxext/math_symbol_table.py
@@ -104,7 +104,7 @@ def render_symbol(sym):
         if sym.startswith("\\"):
             sym = sym[1:]
             if sym not in (_mathtext.Parser._overunder_functions |
-                           {*_mathtext.Parser._function_names}):
+                           _mathtext.Parser._function_names):
                 sym = chr(_mathtext_data.tex2uni[sym])
         return f'\\{sym}' if sym in ('\\', '|') else sym
 
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -31,7 +31,6 @@
     _Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
     RendererBase)
 from matplotlib.font_manager import ttfFontProperty
-from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
 
@@ -123,9 +122,6 @@ def attr(field):
 
 
 class RendererCairo(RendererBase):
-    mathtext_parser = _api.deprecated("3.4")(
-        property(lambda self: MathTextParser('Cairo')))
-
     def __init__(self, dpi):
         self.dpi = dpi
         self.gc = GraphicsContextCairo(renderer=self)
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -39,7 +39,6 @@
 import matplotlib.dviread as dviread
 from matplotlib.ft2font import (FIXED_WIDTH, ITALIC, LOAD_NO_SCALE,
                                 LOAD_NO_HINTING, KERNING_UNFITTED, FT2Font)
-from matplotlib.mathtext import MathTextParser
 from matplotlib.transforms import Affine2D, BboxBase
 from matplotlib.path import Path
 from matplotlib.dates import UTC
@@ -1900,11 +1899,6 @@ def __init__(self, file, image_dpi, height, width):
         self.gc = self.new_gc()
         self.image_dpi = image_dpi
 
-    @_api.deprecated("3.4")
-    @property
-    def mathtext_parser(self):
-        return MathTextParser("Pdf")
-
     def finalize(self):
         self.file.output(*self.gc.finalize())
 
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -7,12 +7,11 @@
 from enum import Enum
 import functools
 import glob
-from io import StringIO, TextIOWrapper
+from io import StringIO
 import logging
 import math
 import os
 import pathlib
-import tempfile
 import re
 import shutil
 from tempfile import TemporaryDirectory
@@ -30,7 +29,6 @@
 from matplotlib.font_manager import get_font
 from matplotlib.ft2font import LOAD_NO_HINTING, LOAD_NO_SCALE, FT2Font
 from matplotlib._ttconv import convert_ttf_to_ps
-from matplotlib.mathtext import MathTextParser
 from matplotlib._mathtext_data import uni2type1
 from matplotlib.path import Path
 from matplotlib.texmanager import TexManager
@@ -263,9 +261,6 @@ class RendererPS(_backend_pdf_ps.RendererPDFPSBase):
     _afm_font_dir = cbook._get_data_path("fonts/afm")
     _use_afm_rc_name = "ps.useafm"
 
-    mathtext_parser = _api.deprecated("3.4")(property(
-        lambda self: MathTextParser("PS")))
-
     def __init__(self, width, height, pswriter, imagedpi=72):
         # Although postscript itself is dpi independent, we need to inform the
         # image code about a requested dpi to generate high resolution images
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -20,7 +20,6 @@
 from matplotlib.backends.backend_mixed import MixedModeRenderer
 from matplotlib.colors import rgb2hex
 from matplotlib.dates import UTC
-from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib import _path
 from matplotlib.transforms import Affine2D, Affine2DBase
@@ -318,11 +317,6 @@ def __init__(self, width, height, svgwriter, basename=None, image_dpi=72,
         self._write_metadata(metadata)
         self._write_default_style()
 
-    @_api.deprecated("3.4")
-    @property
-    def mathtext_parser(self):
-        return MathTextParser('SVG')
-
     def finalize(self):
         self._write_clips()
         self._write_hatches()
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -21,8 +21,7 @@
 
 import numpy as np
 
-from matplotlib import (
-    _api, rcParams, _mathtext)
+from matplotlib import _api, rcParams, _mathtext
 from matplotlib.ft2font import FT2Image, LOAD_NO_HINTING
 from matplotlib.font_manager import FontProperties
 
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -10,7 +10,7 @@
 import matplotlib as mpl
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
 import matplotlib.pyplot as plt
-from matplotlib import mathtext
+from matplotlib import mathtext, _mathtext
 
 
 # If test is removed, use None as placeholder
@@ -109,7 +109,7 @@
     r'${xyz}^k{x}_{k}{x}^{p}{y}^{p-2} {d}_{i}^{j}{b}_{j}{c}_{k}{d} {x}^{j}_{i}{E}^{0}{E}^0_u$',
     r'${\int}_x^x x\oint_x^x x\int_{X}^{X}x\int_x x \int^x x \int_{x} x\int^{x}{\int}_{x} x{\int}^{x}_{x}x$',
     r'testing$^{123}$',
-    None,
+    ' '.join('$\\' + p + '$' for p in sorted(_mathtext.Parser._accentprefixed)),
     r'$6-2$; $-2$; $ -2$; ${-2}$; ${  -2}$; $20^{+3}_{-2}$',
     r'$\overline{\omega}^x \frac{1}{2}_0^x$',  # github issue #5444
     r'$,$ $.$ $1{,}234{, }567{ , }890$ and $1,234,567,890$',  # github issue 5799
