matplotlib · anntzer · Mar 29, 2025 · Apr 17, 2025 · Apr 17, 2025
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -991,11 +991,11 @@ def _embedTeXFont(self, fontinfo):
 
         # Widths
         widthsObject = self.reserveObject('font widths')
-        tfm = fontinfo.dvifont._tfm
+        font_metrics = fontinfo.dvifont._metrics
         # convert from TeX's 12.20 representation to 1/1000 text space units.
-        widths = [(1000 * metrics.tex_width) >> 20
-                  if (metrics := tfm.get_metrics(char)) else 0
-                  for char in range(max(tfm._glyph_metrics, default=-1) + 1)]
+        widths = [(1000 * glyph_metrics.tex_width) >> 20
+                  if (glyph_metrics := font_metrics.get_metrics(char)) else 0
+                  for char in range(max(font_metrics._glyph_metrics, default=-1) + 1)]
         self.writeObject(widthsObject, widths)
 
         # Font dictionary

diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
diff --git a/lib/matplotlib/dviread.pyi b/lib/matplotlib/dviread.pyi
@@ -41,6 +41,8 @@ class Text(NamedTuple):
     @property
     def font_effects(self) -> dict[str, float]: ...
     @property
+    def index(self) -> int: ...  # type: ignore[override]
+    @property
     def glyph_name_or_index(self) -> int | str: ...
 
 class Dvi:
@@ -56,14 +58,27 @@ class Dvi:
 
 class DviFont:
     texname: bytes
-    size: float
     def __init__(
-        self, scale: float, tfm: Tfm, texname: bytes, vf: Vf | None
+        self, scale: float, metrics: Tfm | TtfMetrics, texname: bytes, vf: Vf | None
     ) -> None: ...
+    @classmethod
+    def from_luatex(cls, scale: float, texname: bytes): ...
+    @classmethod
+    def from_xetex(
+        cls, scale: float, texname: bytes, subfont: int, effects: dict[str, float]
+    ): ...
     def __eq__(self, other: object) -> bool: ...
     def __ne__(self, other: object) -> bool: ...
     @property
+    def size(self) -> float: ...
+    @property
     def widths(self) -> list[int]: ...
+    @property
+    def path(self) -> Path: ...
+    @property
+    def subfont(self) -> int: ...
+    @property
+    def effects(self) -> dict[str, float]: ...
 
 class Vf(Dvi):
     def __init__(self, filename: str | os.PathLike) -> None: ...
@@ -89,6 +104,10 @@ class Tfm:
     @property
     def depth(self) -> dict[int, int]: ...
 
+class TtfMetrics:
+    def __init__(self, filename: str | os.PathLike) -> None: ...
+    def get_metrics(self, idx: int) -> TexMetrics: ...
+
 class PsFont(NamedTuple):
     texname: bytes
     psname: bytes

diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -327,6 +327,7 @@
                      # zapf chancery, charter, serif, sans-serif, helvetica,
                      # avant garde, courier, monospace, computer modern roman,
                      # computer modern sans serif, computer modern typewriter
+#text.latex.engine: latex
 #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.

diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -1051,6 +1051,7 @@ def _convert_validator_spec(key, conv):
     # text props
     "text.color":          validate_color,
     "text.usetex":         validate_bool,
+    "text.latex.engine":   ["latex", "xelatex", "lualatex"],
     "text.latex.preamble": validate_string,
     "text.hinting":        ["default", "no_autohint", "force_autohint",
                             "no_hinting", "auto", "native", "either", "none"],