Mar 31, 2025 · Mar 28, 2025 · Apr 9, 2025 · Mar 27, 2025 · Apr 1, 2025 · Apr 15, 2025
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
      - 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.15.0
    hooks:
diff --git a/extern/meson.build b/extern/meson.build
  # 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 --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
 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 --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
 import enum
 import functools
 import logging
 import math
 import os
 import re
 import types
    def to_vector(self) -> VectorParse:
        w, h, d = map(
            np.ceil, [self.box.width, self.box.height, self.box.depth])
        gs = [(info.font, info.fontsize, info.num, ox,h -oy + info.offset)
        gs = [(info.font, info.fontsize, info.num, ox,-oy + info.offset)
              for ox, oy, info in self.glyphs]
        rs = [(x1,h -y2, x2 - x1, y2 - y1)
        rs = [(x1,-y2, x2 - x1, y2 - y1)
              for x1, y1, x2, y2 in self.rects]
        return VectorParse(w, h + d, d, gs, rs)

    def to_raster(self, *, antialiased: bool) -> RasterParse:
        # Metrics y's and mathtext y's are oriented in opposite directions,
        # hence the switch between ymin and ymax.
        xmin = min([*[ox + info.metrics.xmin for ox, oy, info in self.glyphs],
                    *[x1 for x1, y1, x2, y2 in self.rects], 0]) - 1
        ymin = min([*[oy - info.metrics.ymax for ox, oy, info in self.glyphs],
                    *[y1 for x1, y1, x2, y2 in self.rects], 0]) - 1
        xmax = max([*[ox + info.metrics.xmax for ox, oy, info in self.glyphs],
                    *[x2 for x1, y1, x2, y2 in self.rects], 0]) + 1
        ymax = max([*[oy - info.metrics.ymin for ox, oy, info in self.glyphs],
                    *[y2 for x1, y1, x2, y2 in self.rects], 0]) + 1
        xmin0 = min([*[ox + info.metrics.xmin for ox, oy, info in self.glyphs],
                     *[x1 for x1, y1, x2, y2 in self.rects], 0])
        ymin0 = min([*[oy - max(info.metrics.ymax, info.metrics.iceberg)
                       for ox, oy, info in self.glyphs],
                     *[y1 for x1, y1, x2, y2 in self.rects], 0])
        xmax0 = max([*[ox + info.metrics.xmax for ox, oy, info in self.glyphs],
                     *[x2 for x1, y1, x2, y2 in self.rects], 0])
        ymax0 = max([*[oy - info.metrics.ymin for ox, oy, info in self.glyphs],
                     *[y2 for x1, y1, x2, y2 in self.rects], 0])
        # Rasterizing can leak into the neighboring pixel, hence the +/-1; it
        # will be cropped at the end.
        xmin = math.floor(xmin0 - 1)
        ymin = math.floor(ymin0 - 1)
        xmax = math.ceil(xmax0 + 1)
        ymax = math.ceil(ymax0 + 1)
        w = xmax - xmin
        h =ymax -ymin - self.box.depth
        d = ymax - ymin - self.box.height
        image = FT2Image(int(np.ceil(w)), int(np.ceil(h +max(d, 0))))
        h =max(-ymin, 0)
        d =max(ymax, 0)
        image = FT2Image(w,h +d)

        # Ideally, we could just use self.glyphs and self.rects here, shifting
        # their coordinates by (-xmin, -ymin), but this yields slightly
        # different results due to floating point slop; shipping twice is the
        # old approach and keeps baseline images backcompat.
        shifted = ship(self.box, (-xmin, -ymin))

        for ox, oy, info in shifted.glyphs:
        for ox, oy, info in self.glyphs:
            ox -= xmin
            oy -= (-h + info.offset)
            info.font.draw_glyph_to_bitmap(
                image, int(ox), int(oy - info.metrics.iceberg), info.glyph,
                antialiased=antialiased)
        for x1, y1, x2, y2 in shifted.rects:
                image, ox, oy, info.glyph, antialiased=antialiased)
        for x1, y1, x2, y2 in self.rects:
            x1 -= xmin
            x2 -= xmin
            y1 -= -h
            y2 -= -h
            height = max(int(y2 - y1) - 1, 0)
            if height == 0:
                center = (y2 + y1) / 2
                y = int(center - (height + 1) / 2)
            else:
                y = int(y1)
            image.draw_rect_filled(int(x1), y, int(np.ceil(x2)), y + height)
        return RasterParse(0, 0, w, h + d, d, image)
            image.draw_rect_filled(int(x1), y, math.ceil(x2), y + height)

        image = np.asarray(image)
        while h and (image[0] == 0).all():
            image = image[1:]
            h -= 1
        while d and (image[-1] == 0).all():
            image = image[:-1]
            d -= 1
        return RasterParse(
            xmin - xmin0, d - ymax0, xmax0 - xmin0, ymax0 - ymin0, d, image)


 class FontMetrics(NamedTuple):
            info1 = self._get_info(font1, fontclass1, sym1, fontsize1, dpi)
            info2 = self._get_info(font2, fontclass2, sym2, fontsize2, dpi)
            font = info1.font
            return font.get_kerning(info1.num, info2.num, Kerning.DEFAULT) / 64
            return font.get_kerning(font.get_char_index(info1.num),
                                    font.get_char_index(info2.num),
                                    Kerning.DEFAULT) / 64
        return super().get_kern(font1, fontclass1, sym1, fontsize1,
                                font2, fontclass2, sym2, fontsize2, dpi)

    cur_v = 0.
    cur_h = 0.
    off_h = ox
    off_v = oy + box.height
    off_v = oy
    output = Output(box)

    def clamp(value: float) -> float:
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
        yd = descent * cos(radians(angle))
        x = round(x + ox + xd)
        y = round(y - oy + yd)
        self._renderer.draw_text_image(font_image, x, y + 1, angle, gc)
        self._renderer.draw_text_image(font_image, x, y, angle, gc)

    def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
        # docstring inherited
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
    procs = {}
    for glyph_id in glyph_ids:
        g = font.load_glyph(glyph_id, LoadFlags.NO_SCALE)
        # NOTE: We should be using round(), but instead use
        # "(x+.5).astype(int)" to keep backcompat with the old ttconv code
        # (this is different for negative x's).
        d1 = (np.array([g.horiAdvance, 0, *g.bbox]) * conv + .5).astype(int)
        d1 = [
            round(g.horiAdvance * conv), 0,
            # Round bbox corners *outwards*, so that they indeed bound th glyph.
            math.floor(g.bbox[0] * conv), math.floor(g.bbox[1] * conv),
            math.ceil(g.bbox[2] * conv), math.ceil(g.bbox[3] * conv),
        ]
        v, c = font.get_path()
        v = (v * 64).astype(int)  # Back to TrueType's internal units (1/64's).
        # Backcompat with old ttconv code: control points between two quads are
        # omitted if they are exactly at the midpoint between the control of
        # the quad before and the quad after, but ttconv used to interpolate
        # *after* conversion to PS units, causing floating point errors.  Here
        # we reproduce ttconv's logic, detecting these "implicit" points and
        # re-interpolating them.  Note that occasionally (e.g. with DejaVu Sans
        # glyph "0") a point detected as "implicit" is actually explicit, and
        # will thus be shifted by 1.
        quads, = np.nonzero(c == 3)
        quads_on = quads[1::2]
        quads_mid_on = np.array(
            sorted({*quads_on} & {*(quads - 1)} & {*(quads + 1)}), int)
        implicit = quads_mid_on[
            (v[quads_mid_on]  # As above, use astype(int), not // division
             == ((v[quads_mid_on - 1] + v[quads_mid_on + 1]) / 2).astype(int))
            .all(axis=1)]
        if (font.postscript_name, glyph_id) in [
                ("DejaVuSerif-Italic", 77),  # j
                ("DejaVuSerif-Italic", 135),  # \AA
        ]:
            v[:, 0] -= 1  # Hard-coded backcompat (FreeType shifts glyph by 1).
        v = (v * conv + .5).astype(int)  # As above re: truncation vs rounding.
        v[implicit] = ((  # Fix implicit points; again, truncate.
            (v[implicit - 1] + v[implicit + 1]) / 2).astype(int))
        v = (v * 64 * conv).round()  # Back to TrueType's internal units (1/64's).
        procs[font.get_glyph_name(glyph_id)] = (
            " ".join(map(str, d1)).encode("ascii") + b" d1\n"
            + _path.convert_to_string(
                Path(v, c), None, None, False, None,-1,
                Path(v, c), None, None, False, None,0,
                # no code for quad Beziers triggers auto-conversion to cubics.
                [b"m", b"l", b"", b"c", b"h"], True)
            + b"f")
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
 ##                ("native" is a synonym.)
 ## - force_autohint: Use FreeType's auto-hinter.  ("auto" is a synonym.)
 ## - no_hinting: Disable hinting.  ("none" is a synonym.)
 #text.hinting:force_autohint
 #text.hinting:default

 #text.hinting_factor:8  # Specifies the amount of softness for hinting in the
 #text.hinting_factor:1  # Specifies the amount of softness for hinting in the
                         # horizontal direction.  A value of 1 will hint to full
                         # pixels.  A value of 2 will hint to half pixels etc.
 #text.kerning_factor: 0  # Specifies the scaling factor for kerning values.  This
diff --git a/lib/matplotlib/mpl-data/stylelib/_classic_test_patch.mplstyle b/lib/matplotlib/mpl-data/stylelib/_classic_test_patch.mplstyle
 # 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

 text.hinting: default
 text.hinting_factor: 1
diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py

 def set_font_settings_for_testing():
    mpl.rcParams['font.family'] = 'DejaVu Sans'
    mpl.rcParams['text.hinting'] = 'none'
    mpl.rcParams['text.hinting_factor'] = 8
    if getattr(mpl, '_called_from_pytest', False):
        mpl.rcParams['text.hinting'] = 'default'
        mpl.rcParams['text.hinting_factor'] = 1
    else:
        mpl.rcParams['text.hinting'] = 'none'
        mpl.rcParams['text.hinting_factor'] = 8


 def set_reproducibility_for_testing():
diff --git a/lib/matplotlib/tests/baseline_images/test_agg_filter/agg_filter_alpha.gif b/lib/matplotlib/tests/baseline_images/test_agg_filter/agg_filter_alpha.gif
diff --git a/lib/matplotlib/tests/baseline_images/test_agg_filter/agg_filter_alpha.pdf b/lib/matplotlib/tests/baseline_images/test_agg_filter/agg_filter_alpha.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_agg_filter/agg_filter_alpha.png b/lib/matplotlib/tests/baseline_images/test_agg_filter/agg_filter_alpha.png
diff --git a/lib/matplotlib/tests/baseline_images/test_arrow_patches/boxarrow_test_image.png b/lib/matplotlib/tests/baseline_images/test_arrow_patches/boxarrow_test_image.png
diff --git a/lib/matplotlib/tests/baseline_images/test_artist/default_edges.png b/lib/matplotlib/tests/baseline_images/test_artist/default_edges.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png b/lib/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png b/lib/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bar_tick_label_multiple.png b/lib/matplotlib/tests/baseline_images/test_axes/bar_tick_label_multiple.png
diff --git a/...tests/baseline_images/test_axes/bar_tick_label_multiple_old_label_alignment.png b/...tests/baseline_images/test_axes/bar_tick_label_multiple_old_label_alignment.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bar_tick_label_single.png b/lib/matplotlib/tests/baseline_images/test_axes/bar_tick_label_single.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/barh_tick_label.png b/lib/matplotlib/tests/baseline_images/test_axes/barh_tick_label.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.png
diff --git a/...matplotlib/tests/baseline_images/test_axes/boxplot_autorange_false_whiskers.png b/...matplotlib/tests/baseline_images/test_axes/boxplot_autorange_false_whiskers.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_true_whiskers.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_autorange_true_whiskers.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_custom_capwidths.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_custom_capwidths.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_baseline.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_baseline.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidth.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidth.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidths.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custom_capwidths.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_percentilewhis.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_percentilewhis.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_rangewhis.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_rangewhis.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_xlabels.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_xlabels.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_ylabels.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_with_ylabels.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/canonical.png b/lib/matplotlib/tests/baseline_images/test_axes/canonical.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_basic.png b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_basic.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_limits.png b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_limits.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_zorder.png b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_zorder.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/extent_units.png b/lib/matplotlib/tests/baseline_images/test_axes/extent_units.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/fill_units.png b/lib/matplotlib/tests/baseline_images/test_axes/fill_units.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hexbin_log.png b/lib/matplotlib/tests/baseline_images/test_axes/hexbin_log.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_density.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_density.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_offset.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_offset.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_normed.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_normed.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_step.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_step.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_stepfilled.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_stepfilled.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_stepfilled_alpha.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_stepfilled_alpha.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_weights.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_weights.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_step_horiz.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_step_horiz.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hlines_basic.png b/lib/matplotlib/tests/baseline_images/test_axes/hlines_basic.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hlines_masked.png b/lib/matplotlib/tests/baseline_images/test_axes/hlines_masked.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hlines_with_nan.png b/lib/matplotlib/tests/baseline_images/test_axes/hlines_with_nan.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery.png b/lib/matplotlib/tests/baseline_images/test_axes/markevery.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/nonfinite_limits.png b/lib/matplotlib/tests/baseline_images/test_axes/nonfinite_limits.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/o_marker_path_snap.png b/lib/matplotlib/tests/baseline_images/test_axes/o_marker_path_snap.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png b/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pcolor_datetime_axis.png b/lib/matplotlib/tests/baseline_images/test_axes/pcolor_datetime_axis.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_datetime_axis.png b/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_datetime_axis.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_ccw_true.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_ccw_true.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_center_radius.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_center_radius.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_default.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_default.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_frame_grid.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_frame_grid.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_0.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_0.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_2.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_linewidth_2.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_no_label.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_no_label.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png b/lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/preset_clip_paths.png b/lib/matplotlib/tests/baseline_images/test_axes/preset_clip_paths.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/rc_grid.png b/lib/matplotlib/tests/baseline_images/test_axes/rc_grid.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/rc_markerfill.png b/lib/matplotlib/tests/baseline_images/test_axes/rc_markerfill.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/rc_spines.png b/lib/matplotlib/tests/baseline_images/test_axes/rc_spines.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/retain_tick_visibility.png b/lib/matplotlib/tests/baseline_images/test_axes/retain_tick_visibility.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/secondary_xy.png b/lib/matplotlib/tests/baseline_images/test_axes/secondary_xy.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/set_get_ticklabels.png b/lib/matplotlib/tests/baseline_images/test_axes/set_get_ticklabels.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/single_point.png b/lib/matplotlib/tests/baseline_images/test_axes/single_point.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/stackplot_test_image.png b/lib/matplotlib/tests/baseline_images/test_axes/stackplot_test_image.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf b/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/test_stairs_datetime.png b/lib/matplotlib/tests/baseline_images/test_axes/test_stairs_datetime.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/test_stairs_options.png b/lib/matplotlib/tests/baseline_images/test_axes/test_stairs_options.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/twin_axis_locators_formatters.png b/lib/matplotlib/tests/baseline_images/test_axes/twin_axis_locators_formatters.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_baseline.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_baseline.png
diff --git a/...matplotlib/tests/baseline_images/test_axes/violinplot_horiz_custompoints_10.png b/...matplotlib/tests/baseline_images/test_axes/violinplot_horiz_custompoints_10.png
diff --git a/...atplotlib/tests/baseline_images/test_axes/violinplot_horiz_custompoints_200.png b/...atplotlib/tests/baseline_images/test_axes/violinplot_horiz_custompoints_200.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_showall.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_showall.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_showextrema.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_showextrema.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_showmeans.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_showmeans.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_showmedians.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_horiz_showmedians.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_baseline.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_baseline.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_custompoints_10.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_custompoints_10.png
diff --git a/...matplotlib/tests/baseline_images/test_axes/violinplot_vert_custompoints_200.png b/...matplotlib/tests/baseline_images/test_axes/violinplot_vert_custompoints_200.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_showall.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_showall.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_showextrema.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_showextrema.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_showmeans.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_showmeans.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_showmedians.png b/lib/matplotlib/tests/baseline_images/test_axes/violinplot_vert_showmedians.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/vline_hline_zorder.png b/lib/matplotlib/tests/baseline_images/test_axes/vline_hline_zorder.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/vlines_basic.png b/lib/matplotlib/tests/baseline_images/test_axes/vlines_basic.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/vlines_hlines_blended_transform.png b/lib/matplotlib/tests/baseline_images/test_axes/vlines_hlines_blended_transform.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/vlines_masked.png b/lib/matplotlib/tests/baseline_images/test_axes/vlines_masked.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/vlines_with_nan.png b/lib/matplotlib/tests/baseline_images/test_axes/vlines_with_nan.png
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/kerning.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/kerning.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type3.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type3.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type42.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/multi_font_type42.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/truetype-conversion.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/truetype-conversion.pdf
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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.15.0
		hooks:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@
		import enum
		import functools
		import logging
		import math
		import os
		import re
		import types
Expand DownExpand Up		@@ -128,47 +129,62 @@
		def to_vector(self) -> VectorParse:
		w, h, d = map(
		np.ceil, [self.box.width, self.box.height, self.box.depth])
		gs = [(info.font, info.fontsize, info.num, ox,h -oy + info.offset)
		gs = [(info.font, info.fontsize, info.num, ox,-oy + info.offset)
		for ox, oy, info in self.glyphs]
		rs = [(x1,h -y2, x2 - x1, y2 - y1)
		rs = [(x1,-y2, x2 - x1, y2 - y1)
		for x1, y1, x2, y2 in self.rects]
		return VectorParse(w, h + d, d, gs, rs)

		def to_raster(self, *, antialiased: bool) -> RasterParse:
		# Metrics y's and mathtext y's are oriented in opposite directions,
		# hence the switch between ymin and ymax.
		xmin = min([*[ox + info.metrics.xmin for ox, oy, info in self.glyphs],
		*[x1 for x1, y1, x2, y2 in self.rects], 0]) - 1
		ymin = min([*[oy - info.metrics.ymax for ox, oy, info in self.glyphs],
		*[y1 for x1, y1, x2, y2 in self.rects], 0]) - 1
		xmax = max([*[ox + info.metrics.xmax for ox, oy, info in self.glyphs],
		*[x2 for x1, y1, x2, y2 in self.rects], 0]) + 1
		ymax = max([*[oy - info.metrics.ymin for ox, oy, info in self.glyphs],
		*[y2 for x1, y1, x2, y2 in self.rects], 0]) + 1
		xmin0 = min([*[ox + info.metrics.xmin for ox, oy, info in self.glyphs],
		*[x1 for x1, y1, x2, y2 in self.rects], 0])
		ymin0 = min([*[oy - max(info.metrics.ymax, info.metrics.iceberg)
		for ox, oy, info in self.glyphs],
		*[y1 for x1, y1, x2, y2 in self.rects], 0])
		xmax0 = max([*[ox + info.metrics.xmax for ox, oy, info in self.glyphs],
		*[x2 for x1, y1, x2, y2 in self.rects], 0])
		ymax0 = max([*[oy - info.metrics.ymin for ox, oy, info in self.glyphs],
		*[y2 for x1, y1, x2, y2 in self.rects], 0])
		# Rasterizing can leak into the neighboring pixel, hence the +/-1; it
		# will be cropped at the end.
		xmin = math.floor(xmin0 - 1)
		ymin = math.floor(ymin0 - 1)
		xmax = math.ceil(xmax0 + 1)
		ymax = math.ceil(ymax0 + 1)
		w = xmax - xmin
		h =ymax -ymin - self.box.depth
		d = ymax - ymin - self.box.height
		image = FT2Image(int(np.ceil(w)), int(np.ceil(h +max(d, 0))))
		h =max(-ymin, 0)
		d =max(ymax, 0)
		image = FT2Image(w,h +d)

		# Ideally, we could just use self.glyphs and self.rects here, shifting
		# their coordinates by (-xmin, -ymin), but this yields slightly
		# different results due to floating point slop; shipping twice is the
		# old approach and keeps baseline images backcompat.
		shifted = ship(self.box, (-xmin, -ymin))

		for ox, oy, info in shifted.glyphs:
		for ox, oy, info in self.glyphs:
		ox -= xmin
		oy -= (-h + info.offset)
		info.font.draw_glyph_to_bitmap(
		image, int(ox), int(oy - info.metrics.iceberg), info.glyph,
		antialiased=antialiased)
		for x1, y1, x2, y2 in shifted.rects:
		image, ox, oy, info.glyph, antialiased=antialiased)
Check failure on line 165 in lib/matplotlib/_mathtext.py View workflow job for this annotation GitHub Actions/ mypy `[mypy] reported by reviewdog 🐶Argument 2 to "draw_glyph_to_bitmap" of "FT2Font" has incompatible type "float"; expected "int" [arg-type]Raw Output:lib/matplotlib/_mathtext.py:165: error: Argument 2 to "draw_glyph_to_bitmap" of "FT2Font" has incompatible type "float"; expected "int" [arg-type]` Check failure on line 165 in lib/matplotlib/_mathtext.py View workflow job for this annotation GitHub Actions/ mypy `[mypy] reported by reviewdog 🐶Argument 3 to "draw_glyph_to_bitmap" of "FT2Font" has incompatible type "float"; expected "int" [arg-type]Raw Output:lib/matplotlib/_mathtext.py:165: error: Argument 3 to "draw_glyph_to_bitmap" of "FT2Font" has incompatible type "float"; expected "int" [arg-type]`
		for x1, y1, x2, y2 in self.rects:
		x1 -= xmin
		x2 -= xmin
		y1 -= -h
		y2 -= -h
		height = max(int(y2 - y1) - 1, 0)
		if height == 0:
		center = (y2 + y1) / 2
		y = int(center - (height + 1) / 2)
		else:
		y = int(y1)
		image.draw_rect_filled(int(x1), y, int(np.ceil(x2)), y + height)
		return RasterParse(0, 0, w, h + d, d, image)
		image.draw_rect_filled(int(x1), y, math.ceil(x2), y + height)

		image = np.asarray(image)
Check failure on line 179 in lib/matplotlib/_mathtext.py View workflow job for this annotation GitHub Actions/ mypy `[mypy] reported by reviewdog 🐶Incompatible types in assignment (expression has type "ndarray[tuple[int, ...], dtype[Any]]", variable has type "FT2Image") [assignment]Raw Output:lib/matplotlib/_mathtext.py:179: error: Incompatible types in assignment (expression has type "ndarray[tuple[int, ...], dtype[Any]]", variable has type "FT2Image") [assignment]`
		while h and (image[0] == 0).all():
Check failure on line 180 in lib/matplotlib/_mathtext.py View workflow job for this annotation GitHub Actions/ mypy `[mypy] reported by reviewdog 🐶Value of type "FT2Image" is not indexable [index]Raw Output:lib/matplotlib/_mathtext.py:180: error: Value of type "FT2Image" is not indexable [index]`
		image = image[1:]
Check failure on line 181 in lib/matplotlib/_mathtext.py View workflow job for this annotation GitHub Actions/ mypy `[mypy] reported by reviewdog 🐶Value of type "FT2Image" is not indexable [index]Raw Output:lib/matplotlib/_mathtext.py:181: error: Value of type "FT2Image" is not indexable [index]`
		h -= 1
		while d and (image[-1] == 0).all():
Check failure on line 183 in lib/matplotlib/_mathtext.py View workflow job for this annotation GitHub Actions/ mypy `[mypy] reported by reviewdog 🐶Value of type "FT2Image" is not indexable [index]Raw Output:lib/matplotlib/_mathtext.py:183: error: Value of type "FT2Image" is not indexable [index]`
		image = image[:-1]
Check failure on line 184 in lib/matplotlib/_mathtext.py View workflow job for this annotation GitHub Actions/ mypy `[mypy] reported by reviewdog 🐶Value of type "FT2Image" is not indexable [index]Raw Output:lib/matplotlib/_mathtext.py:184: error: Value of type "FT2Image" is not indexable [index]`
		d -= 1
		return RasterParse(
		xmin - xmin0, d - ymax0, xmax0 - xmin0, ymax0 - ymin0, d, image)


		class FontMetrics(NamedTuple):
Expand DownExpand Up		@@ -421,7 +437,9 @@
		info1 = self._get_info(font1, fontclass1, sym1, fontsize1, dpi)
		info2 = self._get_info(font2, fontclass2, sym2, fontsize2, dpi)
		font = info1.font
		return font.get_kerning(info1.num, info2.num, Kerning.DEFAULT) / 64
		return font.get_kerning(font.get_char_index(info1.num),
		font.get_char_index(info2.num),
		Kerning.DEFAULT) / 64
		return super().get_kern(font1, fontclass1, sym1, fontsize1,
		font2, fontclass2, sym2, fontsize2, dpi)

Expand DownExpand Up		@@ -1602,7 +1620,7 @@
		cur_v = 0.
		cur_h = 0.
		off_h = ox
		off_v = oy + box.height
		off_v = oy
		output = Output(box)

		def clamp(value: float) -> float:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -180,7 +180,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
		yd = descent * cos(radians(angle))
		x = round(x + ox + xd)
		y = round(y - oy + yd)
		self._renderer.draw_text_image(font_image, x, y + 1, angle, gc)
		self._renderer.draw_text_image(font_image, x, y, angle, gc)

		def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
		# docstring inherited
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -617,40 +617,18 @@ def _get_pdf_charprocs(font_path, glyph_ids):
		procs = {}
		for glyph_id in glyph_ids:
		g = font.load_glyph(glyph_id, LoadFlags.NO_SCALE)
		# NOTE: We should be using round(), but instead use
		# "(x+.5).astype(int)" to keep backcompat with the old ttconv code
		# (this is different for negative x's).
		d1 = (np.array([g.horiAdvance, 0, g.bbox]) conv + .5).astype(int)
		d1 = [
		round(g.horiAdvance * conv), 0,
		# Round bbox corners outwards, so that they indeed bound th glyph.
		math.floor(g.bbox[0] * conv), math.floor(g.bbox[1] * conv),
		math.ceil(g.bbox[2] * conv), math.ceil(g.bbox[3] * conv),
		]
		v, c = font.get_path()
		v = (v * 64).astype(int) # Back to TrueType's internal units (1/64's).
		# Backcompat with old ttconv code: control points between two quads are
		# omitted if they are exactly at the midpoint between the control of
		# the quad before and the quad after, but ttconv used to interpolate
		# after conversion to PS units, causing floating point errors. Here
		# we reproduce ttconv's logic, detecting these "implicit" points and
		# re-interpolating them. Note that occasionally (e.g. with DejaVu Sans
		# glyph "0") a point detected as "implicit" is actually explicit, and
		# will thus be shifted by 1.
		quads, = np.nonzero(c == 3)
		quads_on = quads[1::2]
		quads_mid_on = np.array(
		sorted({quads_on} & {(quads - 1)} & {*(quads + 1)}), int)
		implicit = quads_mid_on[
		(v[quads_mid_on] # As above, use astype(int), not // division
		== ((v[quads_mid_on - 1] + v[quads_mid_on + 1]) / 2).astype(int))
		.all(axis=1)]
		if (font.postscript_name, glyph_id) in [
		("DejaVuSerif-Italic", 77), # j
		("DejaVuSerif-Italic", 135), # \AA
		]:
		v[:, 0] -= 1 # Hard-coded backcompat (FreeType shifts glyph by 1).
		v = (v * conv + .5).astype(int) # As above re: truncation vs rounding.
		v[implicit] = (( # Fix implicit points; again, truncate.
		(v[implicit - 1] + v[implicit + 1]) / 2).astype(int))
		v = (v * 64 * conv).round() # Back to TrueType's internal units (1/64's).
		procs[font.get_glyph_name(glyph_id)] = (
		" ".join(map(str, d1)).encode("ascii") + b" d1\n"
		+ _path.convert_to_string(
		Path(v, c), None, None, False, None,-1,
		Path(v, c), None, None, False, None,0,
		# no code for quad Beziers triggers auto-conversion to cubics.
		[b"m", b"l", b"", b"c", b"h"], True)
		+ b"f")
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -301,9 +301,9 @@
		## ("native" is a synonym.)
		## - force_autohint: Use FreeType's auto-hinter. ("auto" is a synonym.)
		## - no_hinting: Disable hinting. ("none" is a synonym.)
		#text.hinting:force_autohint
		#text.hinting:default

		#text.hinting_factor:8 # Specifies the amount of softness for hinting in the
		#text.hinting_factor:1 # Specifies the amount of softness for hinting in the
		# horizontal direction. A value of 1 will hint to full
		# pixels. A value of 2 will hint to half pixels etc.
		#text.kerning_factor: 0 # Specifies the scaling factor for kerning values. This
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,8 +1,9 @@
		# 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

		text.hinting: default
		text.hinting_factor: 1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,8 +19,12 @@

		def set_font_settings_for_testing():
		mpl.rcParams['font.family'] = 'DejaVu Sans'
		mpl.rcParams['text.hinting'] = 'none'
		mpl.rcParams['text.hinting_factor'] = 8
		if getattr(mpl, '_called_from_pytest', False):
		mpl.rcParams['text.hinting'] = 'default'
		mpl.rcParams['text.hinting_factor'] = 1
		else:
		mpl.rcParams['text.hinting'] = 'none'
		mpl.rcParams['text.hinting_factor'] = 8
Check warning on line 27 in lib/matplotlib/testing/__init__.py View check run for this annotation Codecov/ codecov/patch lib/matplotlib/testing/__init__.py#L26-L27 `Added lines #L26 - L27 were not covered by tests`


		def set_reproducibility_for_testing():
Expand Down