Merge pull request #22547 from anntzer/tm

timhoffm · web-flow · commit 6d3a068cfc1e · 2022-03-06T22:07:29.000+01:00
Small cleanups around TexManager usage.
diff --git a/doc/api/next_api_changes/deprecations/22547-AL.rst b/doc/api/next_api_changes/deprecations/22547-AL.rst
@@ -0,0 +1,3 @@
+``TextToPath.get_texmanager``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... is deprecated; directly construct a `.texmanager.TexManager` instead.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -49,6 +49,7 @@
 from matplotlib.backend_managers import ToolManager
 from matplotlib.cbook import _setattr_cm
 from matplotlib.path import Path
+from matplotlib.texmanager import TexManager
 from matplotlib.transforms import Affine2D
 from matplotlib._enums import JoinStyle, CapStyle
 
@@ -605,13 +606,12 @@ def get_text_width_height_descent(self, s, prop, ismath):
         to the baseline), in display coords, of the string *s* with
         `.FontProperties` *prop*.
         """
+        fontsize = prop.get_size_in_points()
+
         if ismath == 'TeX':
             # todo: handle props
-            texmanager = self._text2path.get_texmanager()
-            fontsize = prop.get_size_in_points()
-            w, h, d = texmanager.get_text_width_height_descent(
+            return TexManager().get_text_width_height_descent(
                 s, fontsize, renderer=self)
-            return w, h, d
 
         dpi = self.points_to_pixels(72)
         if ismath:
@@ -620,8 +620,7 @@ def get_text_width_height_descent(self, s, prop, ismath):
 
         flags = self._text2path._get_hinting_flag()
         font = self._text2path._get_font(prop)
-        size = prop.get_size_in_points()
-        font.set_size(size, dpi)
+        font.set_size(fontsize, dpi)
         # the width and height of unrotated string
         font.set_text(s, 0.0, flags=flags)
         w, h = font.get_width_height()
@@ -646,7 +645,6 @@ def get_canvas_width_height(self):
     def get_texmanager(self):
         """Return the `.TexManager` instance."""
         if self._texmanager is None:
-            from matplotlib.texmanager import TexManager
             self._texmanager = TexManager()
         return self._texmanager
 
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -5,11 +5,12 @@
 
 import numpy as np
 
-from matplotlib import _text_helpers, dviread, font_manager
+from matplotlib import _api, _text_helpers, dviread, font_manager
 from matplotlib.font_manager import FontProperties, get_font
 from matplotlib.ft2font import LOAD_NO_HINTING, LOAD_TARGET_LIGHT
 from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
+from matplotlib.texmanager import TexManager
 from matplotlib.transforms import Affine2D
 
 _log = logging.getLogger(__name__)
@@ -44,14 +45,11 @@ def _get_char_id(self, font, ccode):
         return urllib.parse.quote(f"{font.postscript_name}-{ccode:x}")
 
     def get_text_width_height_descent(self, s, prop, ismath):
+        fontsize = prop.get_size_in_points()
+
         if ismath == "TeX":
-            texmanager = self.get_texmanager()
-            fontsize = prop.get_size_in_points()
-            w, h, d = texmanager.get_text_width_height_descent(s, fontsize,
-                                                               renderer=None)
-            return w, h, d
+            return TexManager().get_text_width_height_descent(s, fontsize)
 
-        fontsize = prop.get_size_in_points()
         scale = fontsize / self.FONT_SCALE
 
         if ismath:
@@ -215,10 +213,10 @@ def get_glyphs_mathtext(self, prop, s, glyph_map=None,
         return (list(zip(glyph_ids, xpositions, ypositions, sizes)),
                 glyph_map_new, myrects)
 
+    @_api.deprecated("3.6", alternative="TexManager()")
     def get_texmanager(self):
         """Return the cached `~.texmanager.TexManager` instance."""
         if self._texmanager is None:
-            from matplotlib.texmanager import TexManager
             self._texmanager = TexManager()
         return self._texmanager
 
@@ -227,7 +225,7 @@ def get_glyphs_tex(self, prop, s, glyph_map=None,
         """Convert the string *s* to vertices and codes using usetex mode."""
         # Mostly borrowed from pdf backend.
 
-        dvifile = self.get_texmanager().make_dvi(s, self.FONT_SCALE)
+        dvifile = TexManager().make_dvi(s, self.FONT_SCALE)
         with dviread.Dvi(dvifile, self.DPI) as dvi:
             page, = dvi
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+``TextToPath.get_texmanager``
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	+... is deprecated; directly construct a `.texmanager.TexManager` instead.