Merge branch 'ft213' into libraqm

Author: QuLogic

Diff for: .pre-commit-config.yaml

@@ -20,13 +20,13 @@ repos:
       - id: check-docstring-first
         exclude: lib/matplotlib/typing.py  # docstring used for attribute flagged by check
       - id: end-of-file-fixer
-        exclude_types: [svg]
+        exclude_types: [diff, svg]
       - id: mixed-line-ending
       - id: name-tests-test
         args: ["--pytest-test-first"]
       - id: no-commit-to-branch  # Default is master and main.
       - id: trailing-whitespace
-        exclude_types: [svg]
+        exclude_types: [diff, svg]
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.14.1
     hooks:

Diff for: extern/meson.build

@@ -13,11 +13,20 @@ else
   # must match the value in `lib/matplotlib.__init__.py`. Also update the docs
   # in `docs/devel/dependencies.rst`. Bump the cache key in
   # `.circleci/config.yml` when changing requirements.
-  LOCAL_FREETYPE_VERSION = '2.6.1'
+  LOCAL_FREETYPE_VERSION = '2.13.3'
 
   freetype_proj = subproject(
     f'freetype-@LOCAL_FREETYPE_VERSION@',
-    default_options: ['default_library=static'])
+    default_options: [
+      'default_library=static',
+      'brotli=disabled',
+      'bzip2=disabled',
+      'harfbuzz=disabled',
+      'mmap=auto',
+      'png=disabled',
+      'tests=disabled',
+      'zlib=internal',
+  ])
   freetype_dep = freetype_proj.get_variable('freetype_dep')
 endif
 

Diff for: lib/matplotlib/__init__.py

@@ -1317,7 +1317,7 @@ def _val_or_rc(val, rc_name):
 def _init_tests():
     # The version of FreeType to install locally for running the tests. This must match
     # the value in `meson.build`.
-    LOCAL_FREETYPE_VERSION = '2.6.1'
+    LOCAL_FREETYPE_VERSION = '2.13.3'
 
     from matplotlib import ft2font
     if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or

Diff for: lib/matplotlib/_mathtext.py

@@ -163,7 +163,10 @@ def to_raster(self, *, antialiased: bool) -> RasterParse:
 
         for ox, oy, info in shifted.glyphs:
             info.font.draw_glyph_to_bitmap(
-                image, int(ox), int(oy - info.metrics.iceberg), info.glyph,
+                image,
+                int(ox),
+                int(oy - np.ceil(info.metrics.iceberg)) + 1,
+                info.glyph,
                 antialiased=antialiased)
         for x1, y1, x2, y2 in shifted.rects:
             height = max(int(y2 - y1) - 1, 0)

Diff for: lib/matplotlib/mpl-data/stylelib/_classic_test_patch.mplstyle

@@ -1,8 +1,6 @@
 # This patch should go on top of the "classic" style and exists solely to avoid
 # changing baseline images.
 
-text.kerning_factor : 6
-
 ytick.alignment: center_baseline
 
 hatch.color: edge