matplotlib
diff --git a/‎lib/matplotlib/_mathtext.py‎
Lines changed: 21 additions & 9 deletions b/‎lib/matplotlib/_mathtext.py‎
Lines changed: 21 additions & 9 deletions
diff --git a/‎lib/matplotlib/_mathtext_data.py‎
Lines changed: 0 additions & 10 deletions b/‎lib/matplotlib/_mathtext_data.py‎
Lines changed: 0 additions & 10 deletions
@@ -269,8 +269,9 @@ def get_metrics(self, font: str, font_class: str, sym: str, fontsize: float,
         ----------
         font : str
             One of the TeX font names: "tt", "it", "rm", "cal", "sf", "bf",
-            "default", "regular", "bb", "frak", "scr".  "default" and "regular"
-            are synonyms and use the non-math font.
+            "default", "regular", "normal", "bb", "frak", "scr".  "default"
+            and "regular" are synonyms and use the non-math font.
+            "normal" denotes the normal math font.
         font_class : str
             One of the TeX font names (as for *font*), but **not** "bb",
             "frak", or "scr".  This is used to combine two font classes.  The
@@ -457,10 +458,11 @@ class BakomaFonts(TruetypeFonts):
     its own proprietary 8-bit encoding.
     """
     _fontmap = {
+        'normal': 'cmmi10',
         'cal': 'cmsy10',
         'rm':  'cmr10',
         'tt':  'cmtt10',
-        'it':  'cmmi10',
+        'it':  'cmti10',
         'bf':  'cmb10',
         'sf':  'cmss10',
         'ex':  'cmex10',
@@ -480,11 +482,18 @@ def __init__(self, default_font_prop: FontProperties, load_glyph_flags: LoadFlag
     def _get_glyph(self, fontname: str, font_class: str,
                    sym: str) -> tuple[FT2Font, CharacterCodeType, bool]:
         font = None
+
         if fontname in self.fontmap and sym in latex_to_bakoma:
             basename, num = latex_to_bakoma[sym]
-            slanted = (basename == "cmmi10") or sym in self._slanted_symbols
+            slanted = (basename in ("cmmi10", "cmti10")) or sym in self._slanted_symbols
             font = self._get_font(basename)
         elif len(sym) == 1:
+            if fontname == "normal" and sym.isdigit():
+                # use digits from cmr (roman alphabet) instead of cmm (math alphabet),
+                # same as LaTeX does.
+                # This was previously mapped via `latex_to_bakoma`.
+                fontname = "rm"
+
             slanted = (fontname == "it")
             font = self._get_font(fontname)
             if font is not None:
@@ -616,11 +625,14 @@ def _get_glyph(self, fontname: str, font_class: str,
         # Only characters in the "Letter" class should be italicized in 'it'
         # mode.  Greek capital letters should be Roman.
         if found_symbol:
-            if fontname == 'it' and uniindex < 0x10000:
+            if fontname == 'normal' and uniindex < 0x10000:
+                # normal mathematics font
                 char = chr(uniindex)
                 if (unicodedata.category(char)[0] != "L"
                         or unicodedata.name(char).startswith("GREEK CAPITAL")):
                     new_fontname = 'rm'
+                else:
+                    new_fontname = 'it'
 
             slanted = (new_fontname == 'it') or sym in self._slanted_symbols
             found_symbol = False
@@ -637,7 +649,7 @@ def _get_glyph(self, fontname: str, font_class: str,
 
         if not found_symbol:
             if self._fallback_font:
-                if (fontname in ('it', 'regular')
+                if (fontname in ('it', 'regular', 'normal')
                         and isinstance(self._fallback_font, StixFonts)):
                     fontname = 'rm'
 
@@ -649,7 +661,7 @@ def _get_glyph(self, fontname: str, font_class: str,
                 return g
 
             else:
-                if (fontname in ('it', 'regular')
+                if (fontname in ('it', 'regular', 'normal')
                         and isinstance(self, StixFonts)):
                     return self._get_glyph('rm', font_class, sym)
                 _log.warning("Font %r does not have a glyph for %a [U+%x], "
@@ -2010,7 +2022,7 @@ class _MathStyle(enum.Enum):
     _dropsub_symbols = set(r'\int \oint \iint \oiint \iiint \oiiint \iiiint'.split())
 
     _fontnames = set("rm cal it tt sf bf bfit "
-                     "default bb frak scr regular".split())
+                     "default bb frak scr regular normal".split())
 
     _function_names = set("""
       arccos csc ker min arcsin deg lg Pr arctan det lim sec arg dim
@@ -2270,7 +2282,7 @@ def non_math(self, toks: ParseResults) -> T.Any:
         hlist = Hlist(symbols)
         # We're going into math now, so set font to 'it'
         self.push_state()
-        self.get_state().font = mpl.rcParams['mathtext.default']
+        self.get_state().font = "normal"
         return [hlist]
 
     float_literal = staticmethod(pyparsing_common.convert_to_float)
 
@@ -161,16 +161,6 @@
     '('                          : ('cmr10', 0x28),
     ')'                          : ('cmr10', 0x29),
     '+'                          : ('cmr10', 0x2b),
-    '0'                          : ('cmr10', 0x30),
-    '1'                          : ('cmr10', 0x31),
-    '2'                          : ('cmr10', 0x32),
-    '3'                          : ('cmr10', 0x33),
-    '4'                          : ('cmr10', 0x34),
-    '5'                          : ('cmr10', 0x35),
-    '6'                          : ('cmr10', 0x36),
-    '7'                          : ('cmr10', 0x37),
-    '8'                          : ('cmr10', 0x38),
-    '9'                          : ('cmr10', 0x39),
     ':'                          : ('cmr10', 0x3a),
     ';'                          : ('cmr10', 0x3b),
     '='                          : ('cmr10', 0x3d),