matplotlib · devRD · Jul 3, 2023
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -640,6 +640,43 @@ class DejaVuSerifFonts(DejaVuFonts):
     }
 
 
+class LatinModernFonts(UnicodeFonts):
+    """
+    A font handling class for the Latin Modern fonts
+
+    """
+    _fontmap = {
+        'rm': 'Latin Modern Roman',
+        'it': 'Latin Modern Roman:italic',
+        'bf': 'Latin Modern Roman:weight=bold',
+        'bfit': 'Latin Modern Roman:italic:bold',
+        'tt': 'Latin Modern Mono',
+        'sf': 'Latin Modern Sans',
+        'ex': 'Latin Modern Math'
+    }
+    _fallback_font = False
+    _sans = False
+
+    def __init__(self, *args, **kwargs):
+        # This must come first so the backend's owner is set correctly
+        self.fontmap = {}
+        TruetypeFonts.__init__(self, *args, **kwargs)
+
+        for key, name in self._fontmap.items():
+            fullpath = findfont(name)
+            self.fontmap[key] = fullpath
+            self.fontmap[name] = fullpath
+
+    def _get_glyph(self, fontname, font_class, sym):
+        uniindex = get_unicode_index(sym)
+        font = self._get_font(fontname)
+        if font is not None:
+            glyphindex = font.get_char_index(uniindex)
+            if glyphindex != 0:
+                return super()._get_glyph(fontname, font_class, sym)
+        return super()._get_glyph('ex', font_class, sym)
+
+
 class DejaVuSansFonts(DejaVuFonts):
     """
     A font handling class for the DejaVu Sans fonts
@@ -841,6 +878,10 @@ class FontConstantsBase:
     delta_integral = 0.1
 
 
+class LatinModernFontConstants(FontConstantsBase):
+    pass
+
+
 class ComputerModernFontConstants(FontConstantsBase):
     script_space = 0.075
     subdrop = 0.2
@@ -888,6 +929,8 @@ class DejaVuSansFontConstants(FontConstantsBase):
     'cmss10': ComputerModernFontConstants,
     'cmsy10': ComputerModernFontConstants,
     'cmtt10': ComputerModernFontConstants,
+    'Latin Modern Roman': LatinModernFontConstants,
+    'Latin Modern Math': LatinModernFontConstants,
     'STIXGeneral': STIXFontConstants,
     'STIXNonUnicode': STIXFontConstants,
     'STIXSizeFiveSym': STIXFontConstants,

diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -562,7 +562,7 @@ class FontProperties:
       absolute font size, e.g., 10. Default: :rc:`font.size`
 
     - math_fontfamily: The family of fonts used to render math text.
-      Supported values are: 'dejavusans', 'dejavuserif', 'cm',
+      Supported values are: 'lm', 'dejavusans', 'dejavuserif', 'cm',
       'stix', 'stixsans' and 'custom'. Default: :rc:`mathtext.fontset`
 
     Alternatively, a font may be specified using the absolute path to a font

diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -41,6 +41,7 @@ class MathTextParser:
         'dejavusans':  _mathtext.DejaVuSansFonts,
         'stix':        _mathtext.StixFonts,
         'stixsans':    _mathtext.StixSansFonts,
+        'lm':          _mathtext.LatinModernFonts,
         'custom':      _mathtext.UnicodeFonts,
     }
 

diff --git a/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_GUST_FONT.TXT b/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_GUST_FONT.TXT
@@ -0,0 +1,28 @@
+% This is version 1.0, dated 22 June 2009, of the GUST Font License.
+% (GUST is the Polish TeX Users Group, http://www.gust.org.pl)
+%
+% For the most recent version of this license see
+% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt
+% or
+% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
+%
+% This work may be distributed and/or modified under the conditions
+% of the LaTeX Project Public License, either version 1.3c of this
+% license or (at your option) any later version.
+%
+% Please also observe the following clause:
+% 1) it is requested, but not legally required, that derived works be
+%    distributed only after changing the names of the fonts comprising this
+%    work and given in an accompanying "manifest", and that the
+%    files comprising the Work, as listed in the manifest, also be given
+%    new names. Any exceptions to this request are also given in the
+%    manifest.
+%
+%    We recommend the manifest be given in a separate file named
+%    MANIFEST-<fontid>.txt, where <fontid> is some unique identification
+%    of the font family. If a separate "readme" file accompanies the Work,
+%    we recommend a name of the form README-<fontid>.txt.
+%
+% The latest version of the LaTeX Project Public License is in
+% http://www.latex-project.org/lppl.txt and version 1.3c or later
+% is part of all distributions of LaTeX version 2006/05/20 or later.
diff --git a/lib/matplotlib/mpl-data/fonts/ttf/latinmodernmath.otf b/lib/matplotlib/mpl-data/fonts/ttf/latinmodernmath.otf
diff --git a/lib/matplotlib/mpl-data/fonts/ttf/lmbx10.otf b/lib/matplotlib/mpl-data/fonts/ttf/lmbx10.otf
diff --git a/lib/matplotlib/mpl-data/fonts/ttf/lmbxi10.otf b/lib/matplotlib/mpl-data/fonts/ttf/lmbxi10.otf
diff --git a/lib/matplotlib/mpl-data/fonts/ttf/lmr10.otf b/lib/matplotlib/mpl-data/fonts/ttf/lmr10.otf
diff --git a/lib/matplotlib/mpl-data/fonts/ttf/lmri10.otf b/lib/matplotlib/mpl-data/fonts/ttf/lmri10.otf
diff --git a/lib/matplotlib/mpl-data/fonts/ttf/lmss10.otf b/lib/matplotlib/mpl-data/fonts/ttf/lmss10.otf
diff --git a/lib/matplotlib/mpl-data/fonts/ttf/lmtt10.otf b/lib/matplotlib/mpl-data/fonts/ttf/lmtt10.otf
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -267,7 +267,7 @@
 #font.size:    10.0
 
 #font.serif:      DejaVu Serif, Bitstream Vera Serif, Computer Modern Roman, New Century Schoolbook, Century Schoolbook L, Utopia, ITC Bookman, Bookman, Nimbus Roman No9 L, Times New Roman, Times, Palatino, Charter, serif
-#font.sans-serif: DejaVu Sans, Bitstream Vera Sans, Computer Modern Sans Serif, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
+#font.sans-serif: DejaVu Sans, Bitstream Vera Sans, Computer Modern Sans Serif, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, Latin Modern Roman, sans-serif
 #font.cursive:    Apple Chancery, Textile, Zapf Chancery, Sand, Script MT, Felipa, Comic Neue, Comic Sans MS, cursive
 #font.fantasy:    Chicago, Charcoal, Impact, Western, Humor Sans, xkcd, fantasy
 #font.monospace:  DejaVu Sans Mono, Bitstream Vera Sans Mono, Computer Modern Typewriter, Andale Mono, Nimbus Mono L, Courier New, Courier, Fixed, Terminal, monospace
@@ -335,7 +335,7 @@
 ## The following settings allow you to select the fonts in math mode.
 #mathtext.fontset: dejavusans  # Should be 'dejavusans' (default),
                                # 'dejavuserif', 'cm' (Computer Modern), 'stix',
-                               # 'stixsans' or 'custom'
+                               # 'stixsans', 'custom', 'lm' (Latin Modern)
 ## "mathtext.fontset: custom" is defined by the mathtext.bf, .cal, .it, ...
 ## settings which map a TeX font name to a fontconfig font pattern.  (These
 ## settings are not used for other font sets.)

diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -1004,8 +1004,8 @@ def _convert_validator_spec(key, conv):
     "mathtext.bf":             validate_font_properties,
     "mathtext.bfit":           validate_font_properties,
     "mathtext.sf":             validate_font_properties,
-    "mathtext.fontset":        ["dejavusans", "dejavuserif", "cm", "stix",
-                                "stixsans", "custom"],
+    "mathtext.fontset":        ["dejavusans", "dejavuserif", "lm", "cm",
+                                "stix", "stixsans", "custom"],
     "mathtext.default":        ["rm", "cal", "bfit", "it", "tt", "sf", "bf", "default",
                                 "bb", "frak", "scr", "regular"],
     "mathtext.fallback":       _validate_mathtext_fallback,

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_00.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_00.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_01.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_01.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_02.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_02.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_03.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_03.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_04.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_04.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_05.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_05.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_06.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_06.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_07.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_07.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_08.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_08.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_09.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_09.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_10.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_10.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_11.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_11.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_12.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_12.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_13.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_13.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_14.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_14.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_15.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_15.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_16.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_16.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_17.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_17.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_18.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_18.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_19.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_19.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_20.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_20.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_21.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_21.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_22.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_22.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_32.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_32.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_33.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_33.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_34.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_34.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_35.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_35.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_36.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_36.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_37.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_38.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_38.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_39.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_39.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_40.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_40.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_41.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_41.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_42.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_42.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_43.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_43.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_44.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_44.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_45.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_45.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_46.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_46.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_47.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_47.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_48.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_48.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_49.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_49.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_50.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_50.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_51.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_51.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_52.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_52.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_53.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_53.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_54.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_54.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_55.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_55.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_56.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_56.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_57.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_57.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_58.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_58.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_59.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_59.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_60.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_60.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_61.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_61.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_62.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_62.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_63.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_63.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_64.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_lm_64.png
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -247,7 +247,7 @@ def test_mathtext_rendering_lightweight(baseline_images, fontset, index, text):
 @pytest.mark.parametrize(
     'index, text', enumerate(font_tests), ids=range(len(font_tests)))
 @pytest.mark.parametrize(
-    'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
+    'fontset', ['lm', 'cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
 @pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
 @image_comparison(baseline_images=None, extensions=['png'],
                   tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)