From 67b4202058dd8e76d7376765a054ae1d89cb27b4 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Mon, 12 May 2025 20:08:56 +0200 Subject: [PATCH 01/47] Replace FT2Image by plain numpy arrays. --- .../deprecations/30044-AL.rst | 12 ++++ lib/matplotlib/_mathtext.py | 14 +++-- lib/matplotlib/ft2font.pyi | 2 +- lib/matplotlib/tests/test_ft2font.py | 5 +- src/ft2font.cpp | 59 ++++++------------- src/ft2font.h | 13 ++-- src/ft2font_wrapper.cpp | 46 +++++++++------ 7 files changed, 78 insertions(+), 73 deletions(-) create mode 100644 doc/api/next_api_changes/deprecations/30044-AL.rst diff --git a/doc/api/next_api_changes/deprecations/30044-AL.rst b/doc/api/next_api_changes/deprecations/30044-AL.rst new file mode 100644 index 000000000000..e004d5f2730f --- /dev/null +++ b/doc/api/next_api_changes/deprecations/30044-AL.rst @@ -0,0 +1,12 @@ +``FT2Image`` +~~~~~~~~~~~~ +... is deprecated. Use 2D uint8 ndarrays instead. In particular: + +- The ``FT2Image`` constructor took ``width, height`` as separate parameters + but the ndarray constructor takes ``(height, width)`` as single tuple + parameter. +- `.FT2Font.draw_glyph_to_bitmap` now (also) takes 2D uint8 arrays as input. +- ``FT2Image.draw_rect_filled`` should be replaced by directly setting pixel + values to black. +- The ``image`` attribute of the object returned by ``MathTextParser("agg").parse`` + is now a 2D uint8 array. diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py index 3739a517978b..a528a65ca3cb 100644 --- a/lib/matplotlib/_mathtext.py +++ b/lib/matplotlib/_mathtext.py @@ -9,6 +9,7 @@ import enum import functools import logging +import math import os import re import types @@ -19,6 +20,7 @@ from typing import NamedTuple import numpy as np +from numpy.typing import NDArray from pyparsing import ( Empty, Forward, Literal, Group, NotAny, OneOrMore, Optional, ParseBaseException, ParseException, ParseExpression, ParseFatalException, @@ -30,7 +32,7 @@ from ._mathtext_data import ( latex_to_bakoma, stix_glyph_fixes, stix_virtual_fonts, tex2uni) from .font_manager import FontProperties, findfont, get_font -from .ft2font import FT2Font, FT2Image, Kerning, LoadFlags +from .ft2font import FT2Font, Kerning, LoadFlags if T.TYPE_CHECKING: @@ -99,7 +101,7 @@ class RasterParse(NamedTuple): The offsets are always zero. width, height, depth : float The global metrics. - image : FT2Image + image : 2D array of uint8 A raster image. """ ox: float @@ -107,7 +109,7 @@ class RasterParse(NamedTuple): width: float height: float depth: float - image: FT2Image + image: NDArray[np.uint8] RasterParse.__module__ = "matplotlib.mathtext" @@ -148,7 +150,7 @@ def to_raster(self, *, antialiased: bool) -> RasterParse: 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)))) + image = np.zeros((math.ceil(h + max(d, 0)), math.ceil(w)), np.uint8) # Ideally, we could just use self.glyphs and self.rects here, shifting # their coordinates by (-xmin, -ymin), but this yields slightly @@ -167,7 +169,9 @@ def to_raster(self, *, antialiased: bool) -> RasterParse: y = int(center - (height + 1) / 2) else: y = int(y1) - image.draw_rect_filled(int(x1), y, int(np.ceil(x2)), y + height) + x1 = math.floor(x1) + x2 = math.ceil(x2) + image[y:y+height+1, x1:x2+1] = 0xff return RasterParse(0, 0, w, h + d, d, image) diff --git a/lib/matplotlib/ft2font.pyi b/lib/matplotlib/ft2font.pyi index b12710afd801..a413cd3c1a76 100644 --- a/lib/matplotlib/ft2font.pyi +++ b/lib/matplotlib/ft2font.pyi @@ -198,7 +198,7 @@ class FT2Font(Buffer): def _get_fontmap(self, string: str) -> dict[str, FT2Font]: ... def clear(self) -> None: ... def draw_glyph_to_bitmap( - self, image: FT2Image, x: int, y: int, glyph: Glyph, antialiased: bool = ... + self, image: NDArray[np.uint8], x: int, y: int, glyph: Glyph, antialiased: bool = ... ) -> None: ... def draw_glyphs_to_bitmap(self, antialiased: bool = ...) -> None: ... def get_bitmap_offset(self) -> tuple[int, int]: ... diff --git a/lib/matplotlib/tests/test_ft2font.py b/lib/matplotlib/tests/test_ft2font.py index a9f2a56658aa..8b448e17b7fd 100644 --- a/lib/matplotlib/tests/test_ft2font.py +++ b/lib/matplotlib/tests/test_ft2font.py @@ -18,7 +18,8 @@ def test_ft2image_draw_rect_filled(): width = 23 height = 42 for x0, y0, x1, y1 in itertools.product([1, 100], [2, 200], [4, 400], [8, 800]): - im = ft2font.FT2Image(width, height) + with pytest.warns(mpl.MatplotlibDeprecationWarning): + im = ft2font.FT2Image(width, height) im.draw_rect_filled(x0, y0, x1, y1) a = np.asarray(im) assert a.dtype == np.uint8 @@ -823,7 +824,7 @@ def test_ft2font_drawing(): np.testing.assert_array_equal(image, expected) font = ft2font.FT2Font(file, hinting_factor=1, _kerning_factor=0) glyph = font.load_char(ord('M')) - image = ft2font.FT2Image(expected.shape[1], expected.shape[0]) + image = np.zeros(expected.shape, np.uint8) font.draw_glyph_to_bitmap(image, -1, 1, glyph, antialiased=False) np.testing.assert_array_equal(image, expected) diff --git a/src/ft2font.cpp b/src/ft2font.cpp index 94c554cf9f63..b2c2c0fa9bd1 100644 --- a/src/ft2font.cpp +++ b/src/ft2font.cpp @@ -63,51 +63,23 @@ void throw_ft_error(std::string message, FT_Error error) { throw std::runtime_error(os.str()); } -FT2Image::FT2Image() : m_buffer(nullptr), m_width(0), m_height(0) -{ -} - FT2Image::FT2Image(unsigned long width, unsigned long height) - : m_buffer(nullptr), m_width(0), m_height(0) + : m_buffer((unsigned char *)calloc(width * height, 1)), m_width(width), m_height(height) { - resize(width, height); } FT2Image::~FT2Image() { - delete[] m_buffer; + free(m_buffer); } -void FT2Image::resize(long width, long height) +void draw_bitmap( + py::array_t im, FT_Bitmap *bitmap, FT_Int x, FT_Int y) { - if (width <= 0) { - width = 1; - } - if (height <= 0) { - height = 1; - } - size_t numBytes = width * height; - - if ((unsigned long)width != m_width || (unsigned long)height != m_height) { - if (numBytes > m_width * m_height) { - delete[] m_buffer; - m_buffer = nullptr; - m_buffer = new unsigned char[numBytes]; - } + auto buf = im.mutable_data(0); - m_width = (unsigned long)width; - m_height = (unsigned long)height; - } - - if (numBytes && m_buffer) { - memset(m_buffer, 0, numBytes); - } -} - -void FT2Image::draw_bitmap(FT_Bitmap *bitmap, FT_Int x, FT_Int y) -{ - FT_Int image_width = (FT_Int)m_width; - FT_Int image_height = (FT_Int)m_height; + FT_Int image_width = (FT_Int)im.shape(1); + FT_Int image_height = (FT_Int)im.shape(0); FT_Int char_width = bitmap->width; FT_Int char_height = bitmap->rows; @@ -121,14 +93,14 @@ void FT2Image::draw_bitmap(FT_Bitmap *bitmap, FT_Int x, FT_Int y) if (bitmap->pixel_mode == FT_PIXEL_MODE_GRAY) { for (FT_Int i = y1; i < y2; ++i) { - unsigned char *dst = m_buffer + (i * image_width + x1); + unsigned char *dst = buf + (i * image_width + x1); unsigned char *src = bitmap->buffer + (((i - y_offset) * bitmap->pitch) + x_start); for (FT_Int j = x1; j < x2; ++j, ++dst, ++src) *dst |= *src; } } else if (bitmap->pixel_mode == FT_PIXEL_MODE_MONO) { for (FT_Int i = y1; i < y2; ++i) { - unsigned char *dst = m_buffer + (i * image_width + x1); + unsigned char *dst = buf + (i * image_width + x1); unsigned char *src = bitmap->buffer + ((i - y_offset) * bitmap->pitch); for (FT_Int j = x1; j < x2; ++j, ++dst) { int x = (j - x1 + x_start); @@ -259,7 +231,7 @@ FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_, std::vector &fallback_list, FT2Font::WarnFunc warn, bool warn_if_used) - : ft_glyph_warn(warn), warn_if_used(warn_if_used), image(), face(nullptr), + : ft_glyph_warn(warn), warn_if_used(warn_if_used), image({1, 1}), face(nullptr), hinting_factor(hinting_factor_), // set default kerning factor to 0, i.e., no kerning manipulation kerning_factor(0) @@ -676,7 +648,8 @@ void FT2Font::draw_glyphs_to_bitmap(bool antialiased) long width = (bbox.xMax - bbox.xMin) / 64 + 2; long height = (bbox.yMax - bbox.yMin) / 64 + 2; - image.resize(width, height); + image = py::array_t{{height, width}}; + std::memset(image.mutable_data(0), 0, image.nbytes()); for (auto & glyph : glyphs) { FT_Error error = FT_Glyph_To_Bitmap( @@ -692,11 +665,13 @@ void FT2Font::draw_glyphs_to_bitmap(bool antialiased) FT_Int x = (FT_Int)(bitmap->left - (bbox.xMin * (1. / 64.))); FT_Int y = (FT_Int)((bbox.yMax * (1. / 64.)) - bitmap->top + 1); - image.draw_bitmap(&bitmap->bitmap, x, y); + draw_bitmap(image, &bitmap->bitmap, x, y); } } -void FT2Font::draw_glyph_to_bitmap(FT2Image &im, int x, int y, size_t glyphInd, bool antialiased) +void FT2Font::draw_glyph_to_bitmap( + py::array_t im, + int x, int y, size_t glyphInd, bool antialiased) { FT_Vector sub_offset; sub_offset.x = 0; // int((xd - (double)x) * 64.0); @@ -718,7 +693,7 @@ void FT2Font::draw_glyph_to_bitmap(FT2Image &im, int x, int y, size_t glyphInd, FT_BitmapGlyph bitmap = (FT_BitmapGlyph)glyphs[glyphInd]; - im.draw_bitmap(&bitmap->bitmap, x + bitmap->left, y); + draw_bitmap(im, &bitmap->bitmap, x + bitmap->left, y); } void FT2Font::get_glyph_name(unsigned int glyph_number, std::string &buffer, diff --git a/src/ft2font.h b/src/ft2font.h index cb38e337157a..209581d8f362 100644 --- a/src/ft2font.h +++ b/src/ft2font.h @@ -22,6 +22,10 @@ extern "C" { #include FT_TRUETYPE_TABLES_H } +#include +#include +namespace py = pybind11; + /* By definition, FT_FIXED as 2 16bit values stored in a single long. */ @@ -32,7 +36,6 @@ extern "C" { class FT2Image { public: - FT2Image(); FT2Image(unsigned long width, unsigned long height); virtual ~FT2Image(); @@ -101,7 +104,9 @@ class FT2Font void get_bitmap_offset(long *x, long *y); long get_descent(); void draw_glyphs_to_bitmap(bool antialiased); - void draw_glyph_to_bitmap(FT2Image &im, int x, int y, size_t glyphInd, bool antialiased); + void draw_glyph_to_bitmap( + py::array_t im, + int x, int y, size_t glyphInd, bool antialiased); void get_glyph_name(unsigned int glyph_number, std::string &buffer, bool fallback); long get_name_index(char *name); FT_UInt get_char_index(FT_ULong charcode, bool fallback); @@ -113,7 +118,7 @@ class FT2Font return face; } - FT2Image &get_image() + py::array_t &get_image() { return image; } @@ -141,7 +146,7 @@ class FT2Font private: WarnFunc ft_glyph_warn; bool warn_if_used; - FT2Image image; + py::array_t image; FT_Face face; FT_Vector pen; /* untransformed origin */ std::vector glyphs; diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp index 18f26ad4e76b..ca2db6aa0e5b 100644 --- a/src/ft2font_wrapper.cpp +++ b/src/ft2font_wrapper.cpp @@ -968,7 +968,7 @@ const char *PyFT2Font_draw_glyph_to_bitmap__doc__ = R"""( Parameters ---------- - image : FT2Image + image : 2d array of uint8 The image buffer on which to draw the glyph. x, y : int The pixel location at which to draw the glyph. @@ -983,14 +983,16 @@ const char *PyFT2Font_draw_glyph_to_bitmap__doc__ = R"""( )"""; static void -PyFT2Font_draw_glyph_to_bitmap(PyFT2Font *self, FT2Image &image, +PyFT2Font_draw_glyph_to_bitmap(PyFT2Font *self, py::buffer &image, double_or_ vxd, double_or_ vyd, PyGlyph *glyph, bool antialiased = true) { auto xd = _double_to_("x", vxd); auto yd = _double_to_("y", vyd); - self->x->draw_glyph_to_bitmap(image, xd, yd, glyph->glyphInd, antialiased); + self->x->draw_glyph_to_bitmap( + py::array_t{image}, + xd, yd, glyph->glyphInd, antialiased); } const char *PyFT2Font_get_glyph_name__doc__ = R"""( @@ -1440,12 +1442,7 @@ const char *PyFT2Font_get_image__doc__ = R"""( static py::array PyFT2Font_get_image(PyFT2Font *self) { - FT2Image &im = self->x->get_image(); - py::ssize_t dims[] = { - static_cast(im.get_height()), - static_cast(im.get_width()) - }; - return py::array_t(dims, im.get_buffer()); + return self->x->get_image(); } const char *PyFT2Font__get_type1_encoding_vector__doc__ = R"""( @@ -1565,6 +1562,10 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used()) PyFT2Image__doc__) .def(py::init( [](double_or_ width, double_or_ height) { + auto warn = + py::module_::import("matplotlib._api").attr("warn_deprecated"); + warn("since"_a="3.11", "name"_a="FT2Image", "obj_type"_a="class", + "alternative"_a="a 2D uint8 ndarray"); return new FT2Image( _double_to_("width", width), _double_to_("height", height) @@ -1604,8 +1605,8 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used()) .def_property_readonly("bbox", &PyGlyph_get_bbox, "The control box of the glyph."); - py::class_(m, "FT2Font", py::is_final(), py::buffer_protocol(), - PyFT2Font__doc__) + auto cls = py::class_(m, "FT2Font", py::is_final(), py::buffer_protocol(), + PyFT2Font__doc__) .def(py::init(&PyFT2Font_init), "filename"_a, "hinting_factor"_a=8, py::kw_only(), "_fallback_list"_a=py::none(), "_kerning_factor"_a=0, @@ -1639,10 +1640,20 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used()) .def("get_descent", &PyFT2Font_get_descent, PyFT2Font_get_descent__doc__) .def("draw_glyphs_to_bitmap", &PyFT2Font_draw_glyphs_to_bitmap, py::kw_only(), "antialiased"_a=true, - PyFT2Font_draw_glyphs_to_bitmap__doc__) - .def("draw_glyph_to_bitmap", &PyFT2Font_draw_glyph_to_bitmap, - "image"_a, "x"_a, "y"_a, "glyph"_a, py::kw_only(), "antialiased"_a=true, - PyFT2Font_draw_glyph_to_bitmap__doc__) + PyFT2Font_draw_glyphs_to_bitmap__doc__); + // The generated docstring uses an unqualified "Buffer" as type hint, + // which causes an error in sphinx. This is fixed as of pybind11 + // master (since #5566) which now uses "collections.abc.Buffer"; + // restore the signature once that version is released. + { + py::options options{}; + options.disable_function_signatures(); + cls + .def("draw_glyph_to_bitmap", &PyFT2Font_draw_glyph_to_bitmap, + "image"_a, "x"_a, "y"_a, "glyph"_a, py::kw_only(), "antialiased"_a=true, + PyFT2Font_draw_glyph_to_bitmap__doc__); + } + cls .def("get_glyph_name", &PyFT2Font_get_glyph_name, "index"_a, PyFT2Font_get_glyph_name__doc__) .def("get_charmap", &PyFT2Font_get_charmap, PyFT2Font_get_charmap__doc__) @@ -1760,10 +1771,7 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used()) "The original filename for this object.") .def_buffer([](PyFT2Font &self) -> py::buffer_info { - FT2Image &im = self.x->get_image(); - std::vector shape { im.get_height(), im.get_width() }; - std::vector strides { im.get_width(), 1 }; - return py::buffer_info(im.get_buffer(), shape, strides); + return self.x->get_image().request(); }); m.attr("__freetype_version__") = version_string; From ead211025d96599bf058e2c5d27971b0013e1980 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Sun, 18 May 2025 15:36:07 +0200 Subject: [PATCH 02/47] Deprecate point_at_t and document that a BezierSegment can be called --- doc/api/bezier_api.rst | 1 + doc/api/next_api_changes/deprecations/30070-OG.rst | 4 ++++ lib/matplotlib/bezier.py | 8 ++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 doc/api/next_api_changes/deprecations/30070-OG.rst diff --git a/doc/api/bezier_api.rst b/doc/api/bezier_api.rst index b3764ad04b5a..45019153fa63 100644 --- a/doc/api/bezier_api.rst +++ b/doc/api/bezier_api.rst @@ -5,4 +5,5 @@ .. automodule:: matplotlib.bezier :members: :undoc-members: + :special-members: __call__ :show-inheritance: diff --git a/doc/api/next_api_changes/deprecations/30070-OG.rst b/doc/api/next_api_changes/deprecations/30070-OG.rst new file mode 100644 index 000000000000..98786bcfa1d2 --- /dev/null +++ b/doc/api/next_api_changes/deprecations/30070-OG.rst @@ -0,0 +1,4 @@ +``BezierSegment.point_at_t`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +... is deprecated. Instead, it is possible to call the BezierSegment with an argument. diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py index 42a6b478d729..b9b67c9a72d6 100644 --- a/lib/matplotlib/bezier.py +++ b/lib/matplotlib/bezier.py @@ -190,6 +190,9 @@ class BezierSegment: """ A d-dimensional Bézier segment. + A BezierSegment can be called with an argument, either a scalar or an array-like + object, to evaluate the curve at that/those location(s). + Parameters ---------- control_points : (N, d) array @@ -223,6 +226,8 @@ def __call__(self, t): return (np.power.outer(1 - t, self._orders[::-1]) * np.power.outer(t, self._orders)) @ self._px + @_api.deprecated( + "3.11", alternative="Call the BezierSegment object with an argument.") def point_at_t(self, t): """ Evaluate the curve at a single point, returning a tuple of *d* floats. @@ -336,10 +341,9 @@ def split_bezier_intersecting_with_closedpath( """ bz = BezierSegment(bezier) - bezier_point_at_t = bz.point_at_t t0, t1 = find_bezier_t_intersecting_with_closedpath( - bezier_point_at_t, inside_closedpath, tolerance=tolerance) + lambda t: tuple(bz(t)), inside_closedpath, tolerance=tolerance) _left, _right = split_de_casteljau(bezier, (t0 + t1) / 2.) return _left, _right From 9ef312809b984cc015e3a08461b08eef78c73c83 Mon Sep 17 00:00:00 2001 From: r3kste <138380708+r3kste@users.noreply.github.com> Date: Sat, 17 May 2025 11:48:11 +0530 Subject: [PATCH 03/47] hatch fill for pdf backend --- lib/matplotlib/backends/backend_pdf.py | 2 ++ .../test_artist/clip_path_clipping.pdf | Bin 4149 -> 4155 bytes .../baseline_images/test_artist/hatching.pdf | Bin 2626 -> 2478 bytes .../test_axes/contour_hatching.pdf | Bin 38851 -> 38826 bytes .../test_backend_pdf/hatching_legend.pdf | Bin 2703 -> 2703 bytes .../imshow_masked_interpolation.pdf | Bin 42086 -> 42076 bytes .../baseline_images/test_legend/hatching.pdf | Bin 11426 -> 11379 bytes .../test_patches/multi_color_hatch.pdf | Bin 6190 -> 6110 bytes .../test_patheffects/patheffect3.pdf | Bin 27653 -> 27738 bytes 9 files changed, 2 insertions(+) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index eb9d217c932c..6bf2e2bd8fd9 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -1577,6 +1577,8 @@ def writeHatches(self): Op.setrgb_nonstroke, 0, 0, sidelen, sidelen, Op.rectangle, Op.fill) + self.output(stroke_rgb[0], stroke_rgb[1], stroke_rgb[2], + Op.setrgb_nonstroke) self.output(lw, Op.setlinewidth) diff --git a/lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.pdf b/lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.pdf index 6501d3d91ba0e3d96def23dfdfdd628cd2cc0403..cac3b8f7751e08ee8b376a488f106d197e591636 100644 GIT binary patch delta 1671 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 delta 1444 zcmZ1{d`M)%MMi_k4_SpLKJ~BX(swV)FD+28u~Ey$9^xZOZN>Yn}bWUPPs!M8eeoE?OTUOrst)ag8B8EJBpNIbtuSixeo0PnB z%OjVE2N(+-mWr%B<@F})*8cwI+K)B4r#Od4`Of=0>Bmz`W0v0z9~cC`eX~ET{v+r7 zdWQnpMZI+`YXn#K$~_M})s&_2?c#TVeXVz=>J}T_E1i(^FvM^Y-)GI_hphHxGR8vT z+&*9Uj$f^7imz9ZRA38p-SqsUoZTVDvT&Ps8Ja?CPr34>%&k{-(Fx3Ys&ePSkAzv@ zV&`Aw++7|&Z{E9p_8ry--?cp`Dd%Xs6wo1ZDol8xNS>COvt+m1?WSOtKIf%DF7AE!m*H|5j|Wzn#zC%2hbo?3J4Fv|EX<<~>ZB|MzJ{*(~8x8js_)u^sL5y7ntm z_2-P`Ue3P3>7}c>EnmG~mfQQK{t9>cqvXC>9fdv5roKv^x9X%#vbP0D`dY(P0r$$X zwr|@a{zhGj3doAPWE^$*tdxI+=lKj@;ny2p&Y3sS`}{HepZD132C%OF@=9!n&>By} z;`RBBeG`ngUGt7upe$lNao^#dJ0H*J|9e{VtNZ{*@noYtvitputK)LcmfmW&H?(?e zS^wXy)Jgx{C8_NX#cx}b1c6dhaY<2XVlFIQffErZVVN3PPQJw4$Y=yi!k3tU91T{L zdTSwOLk{QaxlP;^?2qMdFY}ylt&;gBZFY?PA+GUg06{k|mYMxD;TQ7v}DH52|DxcXD zcFW8*&&ObnS;I>ymqnNN39@@B6do2=@KSljmC6Bg?PM>OJ4_~qKsTw?J1cUyRQnxd z{lmPXBX`!9oz9coX5WAEE3$5p^|>9pZKgcUFka$!+3v%{d&^#waMs=N{Bm*f{IXyhiA6y)TW!#fm!@m*VaeF7ED5fda+d-EOgB#ogT>A!q765ihkQ?Zm zqZNQ%6=Y@M3gG&u@D(5;f@0xd{-2`2|1pqpbZ`T3|Gx_CIx42N7G`b${{La6z1(Eg z-9T;@0G|I5sDj+wELf^cR9rAH`Bl_+b_-gjC68Ii3x;+(``0>(`e|clP`|-Y!|9HcG9r$rCn-KW& z691>ahU(*X@wv?4xQ70NU_J2pCSLS?O7#6Ie^>Mg^QkTHsn~<_;EH81>_a5Y`19wF z_r;fs!q+I9h`xZ=H|;n3kB9gVI^B1=()_vQ8pe;0kLMcEkC&;QkJlYhx|iq=`h0@? zSL1;9tDaZNkF%b)lfXC6CoR#B$NZhCz}JJokDd5Wfw4TUcA~uR%z}hZ_<;kTtWNwZ zn&O0$U$4>v_A>3xYA1PIMr0kXBdtbt10S+ie@eRiKL_0FhtQ`J{;&jMV6Sjd^ak(LUvbYg!O|?j0e&(oQYoIF9dJ z&G=IV`J`BlJ-jNrFvWY#{>0amnokfI%ghd+Z#T-o{>#0t)R=8Nd61IyOxuAo{dV@c z2D{!*Q0JwFxyJZiE72HBhM6PIxGOGWH-3yC!e${{%NaNpo^@TZ%Nafs@*YeaIHWh6 zBYK^&H#Xjr(NsoOtaDJ4V(n(}c4uKW|TI zah*BlZZQM>qJ1ZXj(dVDD$^8ITKjgcWqNmSJXyuQr0T=_gDzg=?wLE7HH$ibp^7G* z>B6$axC=~i%WslvrE4$hmD4p*AD|_o`1?kd!XQbyI9jdh*F58eTAo^>F@Cb{9-<^f z^qOb6y!muDd5@|`;BE9Fk7@bq@`glrOVvr?g+W#QvRTRoU_)s=qB<+mo{6&I{YzDa zsUk>pNN|r7@uk)4qY(T`Q+cWl=}YSmu;MH+mdMU3_e}FDGuEUqs2bT%34gYW$?@fM?Gs6?Va((BD-yux8KbEs zL=gLc!D-qwmY!wla7_`CIm_6*+8mx3f5$S~FMsFsl>-vM+-{L2JfyMbAEnzVj?(<8 zr8uN*h~%qCXVEvVCx5ylg;gNlK0Qn4!ASl9msPBpL-dOzWLxB;URcHatj+u?A#`Q3Gr$-Z^+8JrIS%F+N5rI-wPhM z@cQWcgf}aVG_a0PLW5MPMvo~6@45XtM9DT1d~W*>Q=rI*TveFCAw#mkiF zF84Tzg454y(a}jD^g-hz(o;M4B#J9zeaYpGAo`QNW?Wl7iVD}aANy4fKNjH{gqKKu z=LBwjo25+qa2_t#iZmXC5B=FAd1{Gol~XTF^%ivPfI^`Gyhbt?T-@>P)!QaxX=S{Q zh|03)8=}{j*oj~S%KXBIh!Y5JBV947Q|6P+IpzGFL83*_%FQb4q<7A}^GeYbu|=}S z&?y^)KGxt00F7?b@}?vd`@T6P8n3B;GDFUgMRE@%;=V0aK?bD>t6do(F_;o91&k$x z(=a>=thWpMA=4-%xQ7P8bjXWF!XaLhhQlG&TlZrbm-XnUrT957fk*Vl>u;|Qoqi%Q z_n*!L$p3pWr(9(4uk#f(f@t)MqKvMd=c5Se<7g>R1^HVm7`xwO16EFPLd)9_msH51 zGd2*3S7hD`I^Ct5{7e7LK^tNk`4uvm;=+v|d8 zCnfh@XbIZyiI1WJ+kepHjoGC=GGF8Z!v|_K_V#?NpmxxZfg3`xF_-MkoI6_vCctYP ziz{!25=+B~b?rV9x}xt(Pdu;Ef~-T8wAE)_9Gi?c+U6cfbO zqg#)PFvxx)7g1|8sj4&(s|x$ffiH!I)vH}H0&mRWuRdDaUv~wf--OX>RfO<&4i!q^g{p}5 zxL`g7AECQE&5QEU_QM{cf5J*iOrjSHK79ikxGW$9&|%vt+Pk{7f$8QV(SaZ+}p1yJWw zn=GG}T_IwJO`b@;)8nh}3thGOzRS7UQy|?}LiHK{4ccgmcthb|Rk^b&wDLZ?3^?mv z2?P2@somm#hlC;zgx{2s8fEh;-V6^~Owv8o=SAhIjRw_D9+G~`E+pshglm71Pv3nNUjpE{IOsdOfqfH33Sa(c~%_co<;4uu%XrN2@C@ zai#IfB~iys?~IT>z5W^lP{9u2C$4j z6Fl*~OuJ$JES6IX9wzWAu^E*d9kF3`)Ta2_7Vq|8O6!zxS;ET=$x1o%lv#A(<=H*I zM!TbdsHca|%o4k_HibEr4Sr*3+s+~2cah?Dpi(@gp=>7LHtQ&(?U_bYa7Z7Gq*l8` zYhJ>dUQnGS2A_4&BPvX#HMXI%Tp1=6FG|32w$M%r;$D5C#nCGH9smNt@JX(QHZrj>%#k!X(wRCxDP6KnO(X7GO z1X}(RFwJ1DUEQsOXsYMyyHCd@x1zGbKj`KN#H_COXR@d3DAUbapoGJP>5Mw(2Abh>#?rOle z6F$7|)sbo153+#DfuD%r*}y1|2AV@vr43yjf0v9zH^0?DocO6~Tnk%hPK?*gv>{gkX+vG37S4`- zx~qS52wK8^ZxgQ6w`#VrI%u*->%UuGby(@Hp6e5|D5VeC-&i=W53sI3utIjG7J5Dr zwy{oL0Hcipb$Itw0`)en8omiT(*(Zkz!+FWcFuc_W~Il4H7@H z#c5YnB3tShy{*VV0#?WPMUC?koyU;- zP@Q&Try5PsfSGoi3(~1e(J$&;sqUHT-*Ns&6>I_v?eL+M0yI?XZ8c3vG~#mIlf2rG zb*}|gtQ79lxrWf{&D4KL7N@d1>vQoeCRViHbRSkw_oZh-?VMj;! zVAMqP2wDDF+k7k2TG{;_e{|b;?%PKdE~q7q&9B_x6@Nid!r$#UK>Sd7KWx?JwbIep zd1aVC*-F^P-!0Tny7750_5$H{*a}f-W&LdZu^r9P?=70YdvcVx<=}dFal(6N2dC@I z{hx*ZFaGYhB~oMd^Vk}Q=dizs*G{(gKkEEPhXOmwQJq&4m7P~g6aU8T<{7%+^~e3B z^+(I%^+)=~^~ch|$=2kvS)!GMGjAd_Jw3b0GvLI7h57))(^_jK?BgnqOzL|IBCRY= znWuv-%jZUyCn#Re)6rS0#|_{GvG&@OV>&l<`1O`gqa}5j-lxy0S~{w}Ib~L}Wl4L| zBeRn2WvN&lVL`2nwzxRTrA~BM=ZOQxQ$QPg{d-|`@^s1(?HEHcN5LuB2N61pgfc+j z9-AZn+w@4=HUa!(;aA(Gy$0&C6?ccWRCwS1yTJxDMKI+<_z(S@T1Bk7iXC6N9S(y0 z)P8lAZ%WkVF64iFg*H`Ha9}5z?=gZ?mi*0Y`SJQAm_9TG`Hdx7fyQnNP3nnT3oLR= zq(mN1_iaWU_*ZJ_b=`caSJa_OyYc3#ZZjDFkT zcA`Ps>kjW3&mQmDw|&mGk^|nZpEGuejw_9>%%e!b2${gAq=!7Sg4*yrz!V>>%|4cy}T_p#)Db+Cts- z&4ijIOpN616At5tHSZrcqoI{PIXVaC26uWANg5Bpxa1P9%GEz z`o=-@>qMu&Bg7gs1Qt`fKSObhGbEimvfk0pLHok<%)aylOINZJn5nMLT5Z;A9P`$b zSn!XkrGCQ3=HNJ)JgUi{(!5`X_CirFI1+Ni9Bs|gV;3Fw}9LG!GTN?k)8gPOGN zQ;&*m<=@(g&apHnEWcY%rkO({1(pLoeNDA-|Jk^PgoC1YlTT?=sqRK4jtvB zv)f3Y1f{`>8NH}kYd3&L&sZS?WU5b}n#>-Pm5RKayWgoz#w}w{`@~;glcyV8^-8sx`#BEBa9X@?*)Jjt1@c7 z`E@lD^gtSl2XkMNUb*gc#QcJXd377RJ$|{SLAP)I9a+${ zQan1pTm)}bzK`{)>z4roR7!8xep;hOMY@Q*QEmnuf|QoORy-)r@#zU0ioV349`%-= zA%|8e7OC>os^yj4j+Y_5!H*GDJT8mpt`yG3c1{P|(qKBSA&r9Dd_a-6r70k(H$^y0 zgf=pbHb%`~V%Uydv9W_Uh?qaYKhM_Gxoui1*4YTq%NkjMADL6m4jISpNz+mVY&i_z zdk>R4)&4qa3?P=bZe-hQ4A6c560Z2}J?LhdsOq)f&34WYjDFFAZ0DuwzOv{LJZPm4 z{fe@1wzJn={raX#696HI98Hv`jtoi~W$PKrlo}rc=jT(;u=6ru=LJACdU$_*fl}P9 zmoiW+X_abyVY+^sgT=k#NG8DrU6(~X>0iA5ihW;D3$&~5xm)@IdHeBVNpi*h`Kjgp zRln^0m(2%OPhiw;&)x0D@{42cds*p+{)dVWyvPblw-8o$2Y$B@sYo_J;OX4u=``Z$Jn!ka@oD@;xcO}S#Lks&*?y&I)qX{K!+vFcYq7aW$Fd_&bFaO{tLyjY8vy>6U+xNqXRs@QaeWKzj&wV)FLT{$bp&yLpahymt) z(OcPs^und2IiVr-(Bi~kugsrc^Z3k~jK8W%RbG7~N+`xnH<-SQ_y}no8x$1y*kyTW z*Z@E{gXT!{P>dOr+*_{w_Nbzx+i3UI=|1GOkWnzFbx%|vZ8QOuC5om%S?xia6z42C zBJN+bO#8ul69T;ZjGXD!2a$xy(QO3YnLa+eV^T_K(G@>)!gg4N&2t{$AEN4EYB|2d zAfH4a;bBI$4Km~4D;PMF4bX`>ME!W7Smcl&r3-{>royNYwnSDLCx#n+#ese}#nn?Qyd^T;UNogR#_x!NLJUuAY>_;XX+N;aIiws1 z*Xq=VM2UiE9MwosB-{rog|Rd3)qh$Y6Jm1)YnocK{``Yh)_^wBvJHRdWsUj)c>N{o z-+9j1yfi(@kDYOjY?s{qL?f|WBS2B|GLUiX!9|)imX-F_!m%FudLAxx0+3lQT&^hA z!H<0E0`^>4gT=HB3y5%icvq*ZIW2FRb;3huG4PVUTwl|3Pmr8*gIkdWuqEkGXP%pg z;WGqo5&#`BODqtb(a+kRLO;SemKj_pdkQZ(s4!dd)0L3%K_au_2XsyM06Pz(H3~V# zy+D@ADHz+axWf}U9)BUIV@yN*n%ZJ2>LbYA&k8$4F=&Z*cX!NFk09`IP0qLn&zM9M zv3na0;{6$vOReN{^BlVVLp~KNUc3zsa+Pnn&gALx18f0a;%;{OP0qZjRPrJFFK*pc zE9I--EB-1$f9b55pE}7Fe89UFPf<{f04h;O#ns5yhJ`9E6~Z`4!4p8-Jv>~^yR4FF z=|asu3!B0yiq4vm{#*Q?!3f2ebjyO-t)PR8fZz%z?L8=VHNig1N-IMeo3Dh94 zqkdA+KSmnZ)3dxDj3F{wS$R-;Ne+das4?ANs{PDxm>ME4lWbX!YeC*4*)=V?wdHw& zbrl?N1qJUZ7(Z=nU}to{$nCWi(EpwH1}9&Ui^V~gC2f+XE!+6-UZH1)Sem-@tIuKC zz{=t*hxVX^hc-}1qQ7jo7+!3tvQB!&j9&f3MA99g(x?iWcF|-rwKq5Tlpkl9?jaWmr&@SCK|$et8!% z3@+g-Da)cFx;;pvGFw$5oYr3t^K`&5=`m?faL&QL+0Kgr$$sH0rtzc0ha6enbGXf~KFK_&&Bc~pIgaJ3C(B@wD)CU(By*~Y~u0PE>(Qz|YON0J|HSQyaleXu5X9TEB%8$G`?fM%}QV)GabLGvQU{YYP zlg$o5K0L0D2Sz_M@lUWm>uoOQ@$N6Zo-W|68>BsI^q?sKTe$^Y;ad_&$4O84koSMG zJdH}O@+F#)FSEET@bV~!TzE}GI7wJU5dx0cgj$FA9 zJ~!eQWe#YDMzNOp81Xw2YB+1MlWw22$ivg=C!j&bc|m(}d0Kwulbvgs z{Z&bH9`9N*{o6%a01A{zFBAgNV=y*{6ErkA77%8Lk>eC*fCsArHbjiW8t(fS4o3J; z9gahIkU3Tn!j>bJ9wNvW3kPW{jAImuD#`C!5$S9gAPu&?jTEEqq?OU8W-WDe!Yvf` zr!GVijp{A!?$g-7W9jcS1y^C_EzI{DO(Q2xXZYRL5{}tjc@p4MkA|hLA-S^0gH2kR zqrFS!&MEGLHAFLa7w&2aZ$Y#|>xLce8ADwNsp#&8Y1k7Ot;pp3(CW>JgQ5$q2P6x3 z(h!w$R)x;*tqP5f3KUUXt3$ouwqIH}i#0~9NUBfa^u`GkKS(rooYXi#X*v!I>JCZM z^Nb(nY==58PDHj2H`qC+VeYyq*D6iFCT}A*B19waC>(T?y*_!*gRFf+?8MWH8{;$x z$G_s(-qM*OHY4V==}#o)M3Ry#elD@KIN=+5>;EAW?!CRRJCmX%$UiN3(Se_{pm8F< zU3FZk%WGdj(7(HJW2SO4^IRIm=086fgJTz9UO$ZvLhiOFQ~nx_5-)W#OWTpKnFhzS zFhf(6v?k(a@l1ioa1~09E$&C#=b}pIN3^lEO*>eAGy2IZ<;Z&H=koTkkadm}aVkZ` zw4|N~5^`h6u=^pvElGonX@6#B2XB_~o@Yt#Y+f5;HXo<7$XRj)=R$iAP=D#^iPJW3MW z0^%SGo}?t0HcL;(uZ;vAlu3>7S7^eT|e`BR^X~G0ii1!>VjQ! zT05==l_)AGL3jaI<2!=Dl6e}8kSe_C+NXd@uU=rb**p|kISjsQ3H2MA8Ytb~ zIjU49dZCUJA4#3=YBK#)d}oeG>*>e#Fqb&KQ>UOxg;=>>2Y%`26quqe;{NdfT7uM3 z%8B6sB`+QLeoeu-emc~dAkBA4MNTJ7{<^9+y&E|csj6-4<0W9VocdMq$MSy^q&BR$FSS(q(BnAI z(kQ-G;-Q!@RDXD#)Ne-b-TtQcBq|@>`~Kj}!>=+gg=T+sUy}F>H>3+)*Vj^ZJ71<9 zgRo3ea#JsXFT46nIwDsME>pd`1Cjyh+>HNHA;t;6EgaV;`3&voXPKzZBB8DlJjyO} zhvhHHjb`iI(pZ6`;T`dA3{Z2~aC0!@^@PF~(TXM45(f6e+}*0Y)VnTMXtG~A1){d$ z3~o)oj#TB3APQB)qydI&Lc5T1 zR?R=N{evP#_0AFF>HLn8&(Ak;tyMagb9ZOL7hay=^$Z};Toz= z(&3RpVe;V(P$xz3!xj$!2Gg{PDwy7smIg-Td7qZE`VRy6=xJ^Je!Rc)N;6GxhoH=R zr_%9eSeyDFwq|^i*f=+@r3*&P(JwW$OwCAJ=&vrb_8{HEo!F)qDbTwHvE0)PzrOnB zbGe&~j{EN(eoejoAe@D(EN5$wrZINNu|Oh?k*d;X%0b?EU(R#(s38{i${vp~9p6rB z1kC~jO^TdsGg0X^^UIp6I*9R{(hivqE)p#0%mv&G(nI3D4 z;u5>@84fmK^3yhga2Xdcy-6GER1G7FbI}D=oNq|;&=aB>t#>`Ul?p5iI`r`cwIpoS z?J2fc2jb;c!J@l{A9!{^dpsHZ{2ZkqZyy8_oTO^`ak@Hg=IFh$9HE0_TLWPoN&9gL zthqb?RfJnOk&-U-jY$m4X?J4XUm=UFrb2XGP~%EXyZ*e34``Y`IVJRg0xA|J$90WL z{sJ#PqegWZj_MW%JCU-8tvNF|_uTI{R+eHYu%lV)Bx{&iyMl5hYx#YFZ~__vgs{A7 zi8zncfeneFGEZ)SXV}1xA8(jSdDiX6P9g$9K{9F9?J4Pu)Z&O9;S|y;V`}+WrQ#O>)e4iye$eR`0N5`v$Meg@CM3u?GkJJEX6%Q0hl7cJ(K;4$j$X=12NN>RoQq0i=Dj zg}z8s#cf%MN_vhF*Qod=F}y8Z&|!BXmdIQ(3caPgj2LFG=1oOv(VnaUKA4FDB@BUT zSH?CC(HfL}Pwc+5Nr;Drl(Uq=NB4=x{FFJ z(j1|rrl7GP(@7u0$i5o{CSHe)%?#8Rd~AZ%W#MP=!Et~&u`{!1@|tR6m(Q#{eAAO2 zYW?^1;I3l9xd2QfCoTI^apaX~3M2XY#x@blX(4Efb1$F2>#7yA(&jeWmyBya3J+@t zDVrbISHIT7qTk;u-mUL!hudF3jnE<+@hN8%wIe+9VEj6~=L~BnwShhW_$>~(-qr|y zgk}ds@)F)T7AQ)mPIL=RKFRn&@g#K@v@k;}^gyXnK&5Z`SW&+Hs~Fvd_mAu>(gll+ zI=jL8Op}thDgx>0XI4_f2)H+b54|0THIU&VY#o<#XRF`!N8ARo63S-{IG#uLsz!HC zTW`PcyIB{3c40(KV-dV>1=)S8R1YX)3o(wu9JG;}++@XJpz?!6qb!S>&v*F$u+bF7 zw;5gXIs4#{XG_^hMCwsDYe3gcZQ&S!QvF^-jeT@tBz}MVOwu+8#zVt{ zUB@LQPrv_WDf+@Z0xkULXl5vWgyw7*=jew|61PucM+N|=_mpe#JROF)nXnF~wu$Vh zQADMYbz#vRR!jO&8H@D@CV{)@YdW2P$QBK|UQ@9TlGniq>=`8ug)U+5>~-VnwuDq@ zEzUTiX{bk9^X^JrtS+kmen^MRu>`|8VByLY;0hKuv0E&j4;zJ8SxqPR3nJSPL?!U) zRNZo=9G5rQw*SA`AvYt<{MeAciwijk$hT1Hip>tm7XR+hRi`TJbD5#G8 zZyvfq{xPQyvCy=?#UzMc_pxz&w)l?{RIx>oqrlCN6PC2JvcvwbVNy6nyZix3wah(Z zX=vcFzD%^nvECf;&ePZ{t)FTzuEnET6pMwIdYGieqehs%g_l;CE8Xp)qXz5N_*axO z!iF>~2V%_hKd#7j56Qn31-dupjQf$^2a$2FIkxa{D>y*_TvM(s7F-f;5I^pp8-BuP zQtF9_S+L3*dISBgUH=%p#+eGj1AlFHZ_=En3Td*>s6#4E1eJGuY^$E~B&Gr##8 z>F7JU;|E+gqpd(4%;&7V{Med!+KV(C_0MVjpgFj^*(F(_9E_Y<(NMIR#r>()L0 zFsVEr+YpKzEqyp#GVnn4V*pCNI|88#i8%KA_yOOi@sNDKCy;cvVSr)!GO)oM;$C=Q zBXJ!=l@*v(qGgJsPGc%zKXTKU2} z%>)F3<7pZNQOe9XgkXBiYK4av%os(2&&|q3qY%s)#lt9Q%OxcEN&r#_%H{>q2$tpm zS(pIx0y&g4bAUqsFY^q=;30D&rKmOY4CSypb0XC+bh-?+FuET^>S3QPGBm<8-^^>d zOjw{hxd5#2qgVsg=wt$SejrC@B~&6GWU1C6OJ-xW^gOMC_b2{tfbo=Dx4{z18GB%- z_X$acTeo3726K;o=Z~;%T!~kHmAvT#;>vf@Zz_zB;7k>ymkr?ni3_W$k3cT`&AKz= z=jGMIe`R29kCwCCp$;Wq%L_Z#0sj_z73lTmwe@=Y4$yv6+hmsg3Y)+R!g4MjCPi~u zAYzj&a^P~CCrVBfSSViidgO0)(&T!&>KD2c%SE7;lZ^1j+xm^_7koLUMXIkXdW@6v z&1-0Q>T0ts59N$^Re!!=BJ`z5DL-8mK_3hYH^;dat9}{ciYCXG`&-B--25ZUf(|aU zDTV%fcrNnx1=o2%?cSEWo!&ki+QOI#o+suVs{>R)X4D$BTZVXZvgUSIOqE26*9$Mf z@Ne{!FB9(m4o-}_(&DSTtAO85%kpKja$cs|2k_cTO;7^6!mL&PoH%CDLzy{?0beG2 zMCm=nSd&FfD3U2%+-J70=)TLvXEMvkoiCgO}gj$jAL;K(~eER1bL>t%;Ch;TGX<_>6<=&rZ%7 z4RVlL;#p6vmt)3xb9GcGR;92w2+{bOyB!R&O40Y{ z)@n<^Bozk(12myy*mUE$RhwJ*bX;FBQma8*TJ#AOK}C6HRRUd6$6@>2gFGw>`XT=$ zKvj1@7wUP!%R;$$(?i!z!l5beFyQ zs5LD@z1h@7EZCqmi+jUT*kUe#4dj;7-O4QvTSRzZ z_k4BL+|o!>hQY7;f&nJ5ud0tm!5|v@fgTPMR`TS~nQd8x<^|I_-QQqlJ<7edUefKE zON%$ln;!=7c4&4lclcXHL<1E6nonkyV{+Y2{f%`I49&yxsy)OX)0kKW&+BQaGmrvK zj$Hkqg(VH5qph0w$z?NvGnth&R=a;sR@!Ylwe(!QD<1%wzr8={7@tig5P_`&@h7wm z7iYHqzS&Dm%J9_ZkL(#~=GKY|ylTSln$(})tccTLo3?6Hz0*sbGOFKJN}?iCK2!M` z->>#^ccR?AP$T-P#I0Pez68l6)le7oh$_JIBc0TVhcIM!8Jn_uTEP2C!G^3kfmQ%= ztq%Ot);~IiqWrIIPB{nE5$7sv6!DQ;4tzQaHlmDco9S-DAdvB=_D1MdsgEE8rRlH? z;$x?m_7@4HYFL4YpThdJI%h6KM&w*iipR0tKl3ybLLaM(7Ud?8Vp8f|)-A*{P%`0y z6B2Ocn45KaGeGf}M1Jx4gA&!Iazj|Dxcf{-pbBU3DGhUUr9y0%i61Ji*vv7q6g&)$HDA+S zzn&ZnQ@-0-_v=xJF%Bh|dN&{X@udsT*a2D>c@%EKx+bLeXKsvMi*RDxHtfO(YdlV@ zpb>WvoG`{9M)>9C8V&+hEd{zXmePD2MOIkXMg>e%xIbyho_geSxRL3FIcLa~sbMPq z1aez$tlFef5Dm+L6(1cm!AaHPZ}kIkuQ__3DRC;!Zr-GA{*99~yt#!9nvrbeh)9a- z+j>KByT6>S5xargr^d*?pxo`cS=~TqpwX5Ix2P#b#O!qDzJ=gRj#zx0aKsNJ@s7IA zIS-{iC$FXw8stmrk1!PSq{DwrwfO|^_B6{*USg%y`{-`C+!aBkIU5?SV92=11X~&(7-TSs)Hp zrY=HT&R_|LaPm8y(IF~cXv5Z7{Wk4UD82T8zl$J7m))qB9b?{Z6OLGjjgjtYY!$Gx zkJh4qo*R5n^EGGvw~@0P*GmTc*@nLXw2*(%$s<%D!ilZ3!5 zYGKjVc7C&V4Q~~GfBOx_Dj`}QiO_e*J%vijPN~CA8&R*XX$1Lg4c#sR3RJn3JQ99Z?G{Q-o!6UG3~Xn*R`{pX*hY>v|n3TYx&!pl3hBz)&vti zxgPaFccY0BG)Al@_R_pkYke>alk)`uuO`rhO1;jrp7lWw2jFK!l)HDo04Ub}2_zYF zT9yx!%+~Pzmv5L}ag*Hgf6kgIMb6EdsbYG|nyDu?%${i_?#iC&CMM6B86@`4nHfi3%bA&G z`uv95q+EL%vprdU5rgxgl*)kR6IR6#^x{bJ&M%m6a^F+<3b!>C^kFUxMNBUygXuTP z^q6PUivUP)M$RwBA0-OAC`30Oge651AC^r3;cgT&i6H9wfs)dP;0r9ToX_f8TfKA* zTDw?*QN{%6WEp!C{0lwpF$YaSA;oW5ffT~Rw{?o^84X`^_(d^;1$F1nvfz?-8==S- z4xQts(tAsg)A$8*C<6=@?mvg4^cdx={~7+IR}e5g{U_F9fs|*A{);B@-7x(5M4+Y$ z(;)xPLZb$4lWJV-r({`JDy>+A}8`>CD#7#Ys{r7GQVZt^As zy^b}(0yUVuYM*Xt%or&rLG;(Hr=-yRuZPtWU zhM5r|sb`T&yNkKSHq;Za-1|v|fGN96bV$sVuYlB>&poSZr-^s+U0WS2flPy33yrWH z9xv;rgHmXteCg=jc#a2jMRA7exyVCS8CP-jbhw30YeY(;qFN_n(~4SV;@NzCX{jJH z_qh6$ML5N!67(;`ma+fj_&Y&IO(%?iPx+0EBNoH7RNh%9Bt%28Ia*pROqy{$RkL0a zHtAS0Dp04#BN$Eht+mS-4d2qO6yL)XPuC^e;>g3*WvbJ|KW9a*yhVQ39uYtIIVN|v zo87f7qk6r#^_*99KD<8tXua{K%l`_vHh{7(Lz*_gy!P!FLzMVoW3Xce%OEgq&Td5- zQgRGlzrpqtV1iBh?Dx}Q9NSK;zy3iyHd(>Cnc;*dON07E^9Y}m4L{6DrMivi#s`d%ld=-XxQp{4&PbHwhm3mYMnJ;wP*AhO{sgK@t8kywVHbVAv zAH7d4GGGH%@~co8Yf7FkP|b-R z(H;lLFyMuA$}j-ts$dLB;Id{4$qA5DBbG{))Fv)T6*okNO`|gFL2f{kQ-p3t^HO|l zMJt0`cEBw{F1zs%U&k;k3qT0;mH;yZ5z7K|7%fYH<*+?{iWNerC6*0Bu4RHPM$>zk z3AZ(0$TwF;{t&M~$sS_b9F8H;r=1$4UgDOxUQ%PaVE%4X1V_JJtjT6~g7rrQ-hZ`X zU$31?nk$*ePn8s|ldZfgP&oAzK3yJ1E+Z?LYZ^n@WfC zRt6*O`TVTdkK{HcRAGLH#=gp$*cK5b&}Ewdu4(FN{Cd7vq*zYfRq8`0wymf?aRwTbnxc ziYvvOJg&0&K*b6D8lW$P>GzGgGsLr0dY1Kok?Gm1zqZ64*|!iIj^m=-{Mj15x)5&` z{iy)a4Mq-fr>^YRSS>WJt?GXX=OgwKtMUE$n^?^2Xrb>ERo=V-<+w!`K>yg05NE$6 zI7}9t3ng~0ZNDU)77dSe&ctH^-B_msTNpC@%S=E1YYVDdYFXlP)~^QGeK=8lg+?)w z3g{(~nZ-53>0Gpb`_NC+Ke%8pRh4mli2oQRN|wm^E^{j3DUWJ#Sza? zo8MKMVwaf`CAyZGdcgHHp6et%>#+AlxNJTH^{q6Qp*XH|dj;CRFb8Jer+zfs+XuBo zhAWK7I`_i}ctp-qDxuv5+p&SC9J8!CyK_ud%+? z<|KZmaC-3y4M>eKjZq5IN(wQ*LBRq>#8#1Ptqj zmd?uderb=fDD#<1vLKDia7>~6F3rOJ{+-+1gki5dnct`^OQ>Dr4&=F-ui z_t!4NmvLT=ZC%LF6&wrT1Z}69?k61}`Lb@zX0~xlGcDfGw>M@PB=CfVbF>ZQV^qak zn>^9>yhWFs32>4L_eckI@?Za4j#5*JblYgho)6Q0_%4Xp7sKLyE;IxzY5-x|Abk@NNbu3am(wgY}U6z#7-B#juW+56> zJ>|(J`h({dkM36F{BW<@_1m_ZlM$#8ujz!A_#sY~D+mdw;0ZZxMOts2!a$aYM}6P!r8I}{E%>F?6{?KeiT_58 zva}F9%zxXNBCTS#57JYPZyrDpQsDhg|-d>?_>O>d;?ODH8*O zgWGbumdk%#9+-i@XG>6lGE3&7^>dTsLRlWrVEIEOPF2%ZarF0!ct68V#Pz{97&f4< z_C}%^YBoFJQj&;YO^DvWG5{=l*8>rhORC}Wi|r=SbD$nsbi)Db31D9oP0v`LfK@nz zcCihf$>}fINi$?Q>4w4Y76C7?pAYp03iIr_kO0c{#Iw;M4vdHw~zT9OwOwgohNK7=~Qk7{&Q zNe|vhWHm|L!Y|^S|4WC;QT4JvN(1~FJR4temn1+gAhicUTk(riiyw#PK&j|C@o>C^ zl|_lXMeiBO(FTK2IDiQ)1vg@Aw-Km;J;=|h7gDL)9! z&v^O0K?Qv*df~L|;mZ4O;w7QN(w+jgDb^CZYA>trQ2`#tW} z9^6oV-@;8V>%Ios5PhEx7KvCo__~M`%+q7)wt@ey8OE%Gyd<+=^qQ{XusG! zr)+cG)yWs4iz`6{@NYB_uFR+~4p$fW_opYK=(oHs8vh=Uad9=qpbHjD&iuvV z<#UTgw=t7k`->&O#U1x0grcRO>m1LqNnSc2?Ec1J? zCY!?fIkEG5xF?weO6G=s4;lR&NJ^%cvRS9!gHg#8RWfsxOlT$ZT*>s;?^&^AvMifJ z`#rSw_wlxW9yk3%!I^Rj|E<^p*^}8{D0rp7wrxqlYjfIzZQGO6w{4GD-?n!Y`<|V$ zN49U4tD|C`IRsxkCs&jORn>KMWSc;6e;W#Nb5?cEsRF1g6B`ON`aT z&`t~m^~sGQj46hsVhAgOykdwfiqv8VE{5!4h%bf&`zDAn;1~szF`yX(pfO+?1FSJ1 z8v(d6;2Qtqk+Zu&@Lp%doQ)Q_HZn41-IkxeT&Ppu7y?OQF9E5=@xF3_(ng#SC#w zk;n|8%#h0r(aey}1Od&E(G)Swkko`=&4AYokWF~n-}r5Y>*jcGh688#aE2RacydBB z|0JIiOgh7=Qw%%9wtpesm+j-{&cC&6?}vR1{>wf#|G<{*c<7JKzqrTd-u-KH>*uxM z7P5u)g|XgMF@7vr|A6GQkmWT}zaDhPmrS9TWykW>Vd-wG_?MV96CM3w(nDpIudV18 z3FHLwrdJ0#LJ;j(KU{!cggP!hwET40%1f!`axs39YuON@z;mylOQ1ZS1k$3abb-_1 zxvhvMxvc$ce`(ij$ANcU^!S}#R2l!!1u&{^hJGmuyvGo~F9}byb4!I=Gqg)l;5`x) z1>(TgB&+S&ipF83JPop4c15@@*SzPn0UD;}$eOq&6$0%;)VW_s3XGigmyXQoMSHW( zbKbdk#1ZmN-w`Unx1nb5?>7DEfpI_3v|nwoxE*cq`w!rvLrQksnfkM=X;pbmpy{fi zgb?$%b@gW@v;|YW$6wkYi@QWT8h>x=j$EhR3Q_~fa4lrmQ5m!b*uxgXK^U4ad-u3;_pu#HD{HuRE?TtL zyDfiZ??Xh$4Q5&Kww8tMzT02=`%rUedu8em^S)!n=2JG{Ls=UNmwpR<(eo(oVnxts z{3*zkV8`H2+n+9k9w<_jZu?3{M&ia??a+a>i=D4?voL+{3f$2e(R8|}#rbl&qfz(# zH7@=i*38d2U77`5E=VGGT85!(W8DxThwGXNU#rdKe2@(z zL9#Xn6vP5ra?eHXaz`yf^q!tvbD+|4X?1*V+Eu_?^V93m#p};|le!!iq4_g`-RH`X zU(3@mfD_mj1O1DqbMQI0YP*L$e+=pdR2I+QJ0+jftA7%MFPUHXhB zC5x{;K)OCxrs!)G(8!~S*4mALWVIQx-k1AY2o(4kz05yWJL$49P~q_> zh^w?f-d{>zg_-hN8g zhaPd?d*b?{6*?rQ-K*o~1iZt19rV5?hC*qO6wrQ6#A8b3N(g;zZQ(nuDY5BUJVLpu zKD%_MC<0me*6X$_fao(R&3IdAtM1}8@x+cIl&di6xcSg+*e}{`QS-iPT&{qL>9i8( zm8TO>mUJAKEX5Z{G2T@U3Hz8(AIhrlmq^vuUvn{OkJWs45f{2zNK5SZCO7flj+>l5_uPT|N5b8?Yn5bM+e=6np^|4=NR##aE z?oAF^Yu4KZdR5_$6vtD~7eATrdC>c=0C^vfQscSJkX7I3T|L%&bqKyR@58aVx`Po@ z_EIi^Hk#!m9BnEJ??#-puHK|EZn&nbT31{_4-)LC!>!*F;K{;D{IYyByR^b1mq-KD&((mqlk_!z2$-@(Z0(?k@}Q0Of_F zG9dXVG;Ov(@Sq9^73W<9#&{2n)vRl;TKymRQaKNsiC8503|9D-$AmC)UhM%1cLzgu zTh=avCU1S(@4?Pq-3R_E1*J<_t=Qz~;}$P%7n~8@cj89NbyX9UjR_eL>_ADFGm@_e zs&u?2$D`!{cd%+sD&l}uOJ%t7p6CRe!&Vbeq_M2#j(x`zz)itryBsME`U8Cc0m3c# z<@25jl?bQ@Bf3mR39GkDPdf=W=c$sJ=(?IXX(n|3ZE46LjFaCqF7XTosLE!S)rIDn zSQZ={4Jr}rG2F(L(yTExVp6IkQSw?2sm(+XAHkzNq&DuCKu6QVuwR0ZqiYwDSKzo$ z60u#3`532(MDlsL=)NTa;4;=opP+btj9NZ!DEAY@IW^_&&EqW~MwgS!mS=!GULLc* z5Z!MVQGO3L_cUQy%R1}hyi(mOM8(S8G$2@KQ2WobKin?YQe&kOeLePEV%zdYOP#Gs#7U$17U1p+ep<4S+~M-|~`t8Ac| z7*lo2*~{p>EN%=&9k$hV{CUQh-b0G8eK>Rr5`fy5$5DXeqMRy+eL}#j(aLeopcEl% zuDxW6pp$41UBy1ciWc20om{ufh)ND6$36;CCdWYBz7ACRe4(83A$QKAy#pfH7o-4G z>p2G3o#KkS45^)iOi=M2ZLX_Zy$woNo9>_23|H$|c2%1_>vdOtob9b1Ion%-a<-?4 z^_o0IZ`(GQZ`(G(Z`(HNZ``tX{yBs#sjQdhIC@wM5K34T50?ZH+8d2$T3jo`@%Rwe$`@QeKheYu;6_jk;VQXq zs$bBzZE8^u0Yvl-PJUbV4pB=}J1_;S;<_P&L5r!$0ClLKcJ$M!eInw$Dy~U$1i&wT zR)x09F;ads5E2);Dy|!bh!jMkD66=l0zC2GN@xcm+3!q6WH>-^+$?ION!TH6*}K9J z)s6)I20S9$Dj4(rv&!A0fsvy_6Uy)KNF;L!u%w?=O`l4w$E=1Lf4fMAU3T_DQzA&5 zXgf&}znB^Nj z?ntUAVn9|=me)emH*U(fBeiA~oz?i1r_DM?hyvj+}&LbbMCfkE|S_lX0&Oc(ai z6RJ@!6X(z$7&T@*C{@zol02ju!VR>?^F&G<#w=vk; zCmD`lJpf($@NfQ5u_NO6b^pGatn49>`4 zjs*V5V37nZ$v~70TuC^W42#JyngqK^D4i7QNf@9E8Oji&3`t55rVM#X5vhcz$^fjN zv{r_8WhmHBZY+V!GAJ#D*fQuXgXA)(E`#tAW-mkhG9)lT2ovJ)e+N+f4K!u|WDZPb zfMo_`{suTR;4=Y4|5KXuHojK@-uT`oc;kB^;f?Q|hBNMK5pR62P`vTIh4IGc9>>}C zO^`RfS4rOZUORc?dvoQC`|`^h-}^If1hXzFrPLXpJ2{NM5r?zd-S!P0Ue!!lt2;@j z-^7Am;A8UVz8=(31gdQPS+|MuOA!+u6G8XoW6}#pZ4Ov>l|AV|#$!_GzS>NHL*=yY zFq6(6#x_3&h|0k!Sq3)EIY89^8r=OByV*WI4!D?ob;-jni5X6ZW8moix;R@^l2w*n z&WVw(QMc}C;?RYjYrGfG;*@{G*S{}CM;)|o)3Q+~#3St2L|*r{p*cbq?zJ+KVUKLY z2JCIv;N8RP?B#_sI!GR3hZtfpiB0?M)%F_284b~DH9ICjRGV+?o#tNXIK8p4yWNk% zgZ6QcId!{5bxINjo6~=H7JT~*Ph5d1uoy{n`~1B-lS)!sF%=KuV3prpXUg8&N&eN!BJL5MqhN|t$X5j6jueQWQUB=c#KM4I9R%Vd6nDZw zM2+r+d>xc3#_lye2PoP>b@HkYjNAcTH8cxvx3_GvaScfI=RdB1`jRKBR4PPN&d;!J z2N$>;p0Q0sAxL}`P%^!ONf*1w2ar^3MI$@@fowjmj9GPIh&{&@!MgAYvi!Vcl8~JR zNdB$>*+p+q{e$20s@j6GG|#x)MTdG-(yi++EwCKk?Gg98;1kUWJ%*Qcuwq#BI7pze z+I}JRme)D2EX0M#C^O(fP0bjDRsqmFa~~Ig18Wkd<>b1xV@LPsk#YGz9xWg#Ee%Ll z1uA@_PxO42fKHM;+PJd~bfjQ-NnCdMHCS~!>-4FNrnG4Z^`PXGchRnbzRQRJ=aeUE z4-z_2c|3T){=UE`T#z(BC>7PACLPRs+*9~`PDfua9hOV~BBUyE-1TM0ufes0za8<} zB|4&zGMg+G*G_0yKQCW=mI{|GA()ABrs}hb1(Xz zDp(oMjA4}4_1C*g;y*nxaDu&%p;G-@A&gK-pP$kZ16A}VM}nHs|I<}Y?4N;~3ytWr zAz=D3c4Px6>3qU&xU>#uOa>HDf~J*0{d;v2su3WM+Vt_ddDghq#h+P#%#0&For`Ht z%0`_^p1qZlrt4s*Tm{Gn@XBak*qSE*>>fIrj|{3yBs2 zzti9QVf3;s;K~i^9CYHH#_{iA;wRdpgelKB7}T)h602R6%1wUKLM4=5_FG;~lwRL< zopWwjDImqmd1^Wcl@{}BOADT51oC>#CU=M{9O5`t7U~eWV$1ouac}^wq`lL)>H0AW zm;7BUza!RgbS}LCk=&?Xj6%dR7_AwN7Kld@R1n}}oXro@+go|^&3I*a#p3?b8A3S< znMRsWIoPi;`bD@RG>16T`&-!#>A_da&zF47=W|dsEj5*y)5Rl1+$lb;Hscq{$Iq(4 zJ>pTveM4wEH9Yw-Ok9>{j@RPjT}PGEnALJtW7B1jnXfwICfOnSmhEYvDl}JQuu85g zM2E?PT^yt7S{;`UL2GDpiG>l(7Vz%R?7_j(l~5(Y-lFp%3jv__%uXDOU9VE1*wWQg zwEzS;`H}rN);kK2aw086U(Nb?>U1fWqsS+t30pUtqs}A54X8obFKI~nRKeo&JV&)h zUZ~lz4fjCjiLBsy=8=w?kC<3qps`z(vM)d1t`WA5%CE69UanF3u@>xF$*0GT`VV_7 zipKlP4+%h;J+ZTNP2tNlgpfy8?q(1mhL)#VjPHk;1?XP7M*6uC2R0G7TN8~=L>Nji zI;sk8fC9p632&^|N9Qe6ZEZP<8E!m-+9gFa7VMtppaYF(ct%A8%maj%KWZp$Rs`a1 zXz^{04`}LThxD^X;|5V69+zjC%+X?Qh4MtM8qhoCLVgYtIxXwhnHYVjMByks?GYNd z)`>B$id0l8!MMh5A3v_6NEToeeU~TmAL!Y)hGUiyA$ zh~MQC#5FDicY_kW)vNBeUkb{H@!?itAxZq(d`Z*2SZ{n+hc~`U%p2cz>Wq7>d*iz? zyz$*#-uP}&XWaYT8((MPjjw0%#@9DF<92Y~_x z;QKY}qE+N7MkTasEhwQiXoPz#DLpuC)b_D7SA$=@S2%F7*~*H?Mgd(G-B?#q)E_EP zg>-0dmmOm+`Zdv9Nw=kHa(*}rcW7avYe{P@tM0p~$l`EFTH5OB-w(&O&&rNA2uZ@~ zI$EJD3fIU}e-tB-m-U)oWUw&`PIsMA=RiB$<@Q|&fb0R6AAN-kz!lsBUVVrG4HVc+ z_IHC`ORwW>A6qU|X<+_To85x$j@h8bc1NWPgCK!|=Hm&QD9LU1TVDNW}?9vf%PRNM?Fl<2F#^m1R)RRK%s0 zm>?%PuvWEPeu^L(edubgI;^B$`H#ze(a8%ukpAwSDQ8eAhFz$Rpxuozok^EV!n4lz ziZ&}?C-OQ~FI3%-9q@yQ-n=9K+a-deBkt@<-IW9gsYs%}jrKmrQW4fy$K*aCqx3s(8XI2d#~0n;%@APltC!NA*szxZxG1bOPgQ zTU_3~EH0fli!TQ(i>oFqi>pQ~iz{+0i>r~C#g|x?#T96l#npY5#np{$2!^jaEsLvL zElW|ZyPq|w{KAZ3iNDR7tZUY!o5=VMo7~QRPj1`?hO@ngk+VJL**5K?(%E*nux&ds z*|r_Ryfzo>Y#XZ682I3AJ5a)%WM0^97gVWGcO`f5-35BE1DL(TGA$U?xJISDAsm#N z@>46B3MM|9C!>2ufry@Z==n*pR>W9zevN_FV1}M$loJcSgHC8nC8DypWe2DzA&ASc z^iXHN<<_r>l{?1OzN5OvfbDp=pmVkxSXeMBh<48lZ9-YXaXJ z+>3c4wY#PaR;|Uha^^P`S>BBA$iJ1BfNCj+ksWnt4v1461I$qL2kUlz@7wXyxK4R` zqt|si&cy*}v6|mo^{RwBqmQ`Da}X^s14M5r-aGQ5g8m$U3M4r+!rHjp$aNla>fGm zt)ly?8zq%dLx1}G?WS9GMQGsqu?uba5UpMS^L@{)@;u#w$8|Q)8F-Hmp+JsijAc2P z=}zq@A8L-;-AT&%S;F0bt00Z@$1ci-3R&2=vcw~%UMtEn8kH&CnjK0QbZH(?lU~q&T$5?ZeO~+VvjD1H?d5o+_NPLXk_l@}@ zNI*sqB)~z&CuBTB!aroZM9NoWJVwTEWV}blhh#j-Z~i3XRdT*1<6$y>CgW`~J}2RM zGX5v!g)+V<9cDdU|oJ}Tj@r*Xl==6kU&*=A*me1(= zjKA$F{7+f#^uP|UTQkWdTk}lc-rKq@ ztb=yte|fe%6fGD=eK>RHA{s8Ms?BLa(_gpALdO~6JP?u^iJ=$E3DpAm@qV3A&XcKM zuW9{$`3&OZ`+WxDx*E&8UuUWFptwK^^3RXEt#bC_>^hEc2*goDy(0nVwmUB7)9THD z#xALsKLU+zVA%xVJ)VQ&)U)p-S6(BXuvoH%48&yULa z^c#cD{c5~>N%X^G#}dWCcyu-3qZfcL&gO`rtF`sJ$-)6-0GPrM(D^(_G*INLi9>}* z_;1f15r?P2t`oOopGGG}m9Xr)2W4P+&sgtX7DvTFolO>;MUYr$xnfA=*(>9yJK|!n z$_#im&>)TicO7=)S67!&*SlK4nBk%f6RUA zkG<;NJNa%?6*JmhaDd!4@(AV$1<&boP-~MH5#AHC0D5^f0eCW#3K`~n4$OcowVtvE z4}MBI1Gl~2wWClxoGQaprEtM7A?X5-4d}703D3zuJhDosOD0p6>(QVLo>P0`kyuD) z5Hmg}4+I{U-sOR9DSf1j;2~mOT=UwTJm;|;ShdII;c1V}1JWLwhoC*Qv3~|MW9&1+ zN@Hv_%3@>eHpY5mY&e3FBj7p4sr%;I5ey!u<}u11qw+C|AEW*eN+6>OQVJoX7Bb2q zqauDH6bWyU@fj)4k?|iHFOu;k8IO|SE5BivjE%`qngqPbIGv2^$vB|j*ic3prBqTz zF=fGD0mQ+A;zzA?7l|E+z6Zf-fWf5kwug#jFFFbS$$DXW9|XI;dI4HS5r3 z9o^p@;H+bu^_R15bk@Djy4_iKJnN?aZoX%|`n0#7u>c4h!EcZ3C5dXcnU_dVDt+{%V2a3LgQfc4hH*RY!Jp0A?OiCDj{GK!a-r& z6oy%0R2D{YVbm8!i6K-OMxmk98b-NcR2)XpVbmQ)=^<2~PXrL<1u?!5;}J1_5#t>( zKGHW%iP4uRt%=c{7!8WiqZn<9(5V>BiqfwLEQ_(V2#Sl5yS_&D%Eu&(8H8$TOvzngPeFE8!=Wxc|zx0tjdv(9DG>HPnvGuky$ z)4prcrp>y#Sr<6#8fRVRq${0uvD2=1)+Nun>RA^)>)K~s{)7rZAOe&*z!(LLX}}l= zjF~_f3yjG?84is3z!(vXDe(!QV6+NCw_r33O3z@l4Myi+G!I7qAhZwy7ojW?#x7y3 z6UIhiEEU3DVXPL)c3~_S#*SgE8OEj|C>uh)VWb>N)?p+bM($yxA4UdZBq2f`BA_D5 zH6j=!0!?C!rB5K!H@%6#o){X6fTRd^ia@Fe(ux4EzHwRKY%K=jBG@hh`65U#0ucMg zjeWDp2*->-&%Oz1-!wIXUi${M5v&`7z!78|0n8B`9f8*o)ZHf+?-Qc;)pq<^-ZJU3 zxccj|tgChVH-G=WEba#XwPf+qR}VNsB-uNr;=`wx1fb4S8Q{LF~qb7EgV_ zevYbRly5tprw)Z~J;e+A9jS^@QnkF=;wAdRg}@kt7mB6+30J8@L3Xx&D3KuO5gRnq08So=IvtzwoC zIGx9zY854l2@lp!_Kj%_odV3At_b(UZB}ax$Mn-?H%VS$=1y;fff8f~3s52F5I-8~ zDPD8YLDUA+o-GTDC}Jd)PCEUY3qD|%qsKZBT(F{A#hC482*C~d2>U6m+o6yu6;roh zA9tw$74=h`=K?K_88OPUuD}d81mS9baeGNHF9`g^wMK1=aUww%D8i1LU`r-; zV2K~W9GwLW!o;#r@eaKJ(FLv$D~ii)izHOhNR`pB<-3VoV2rO)B%*2$)GuLgb%({dUM=!R+%Au^N6+P(*r^rGxcYl=u!-9!R|}xaXBF=w z4y--E30y&xtMSm~%Q2vn6l&0)BfnM$)JJ)<@u0UqN57-X-q9bKA&}fGih}FNqo2}M z2PVEPgcLukn1D;4vs=^E9-w5F7^ysbH>fz}i}?OfSJ}YjEJR5cIS$n{baq&|2GM=R zkY3-B>dGt#VB~*ZwWEwKA)NWX+tn3uCIAHwC=h!qp*inpqlNGRW&0OIQxIyPZyMNx`9FlR2!0`wzIc*e-ITm#rzQbdQ*+%(YCz5 zB06=@FnjU)Ae4l7+rGMDiQuV@PU-y)P_&U%wQ5Lcx00{C`?B3jL>WgX6xl*Re*?P1 zUB9uC6F)+6SYFbXvoY;Cv~+z6F)cCWkbfxfOPDXf0# zW(xLkw9C6arcGn2!LqH|QH_a5C%)UkP{uUp2xN2O)bmaL&ObE0DzYhw&duPz8)K|0 zlFBiF1aMdZ=fhB)34JbDjw}S^R`VbkI8TV0jbttLA@g*EwBB-c-2bJNJb~oTKeR&(5TNN#-M{@thkX>tgwLIh(_1p(RTkQN z8uo@UjPu;Vhyw5*UcOv|hP1k>;Q9yP3grqW_HIR(Caa^{zH}#!1SJri+w+wZN`5?r zdc`pAKuh@M!}3Od0GiGrEX(n+pUG z*u>{D>pw*^M=6ZS{;HU0{N87Yfz$if%GQ{GqC}5YZ6Y$8mxmv8xN75bM@h z9%Sf*Y_DCRv5U>JHk9Of$9O2qid)MM^s8V{~II#Bml|8x0 z9uHQc4SV_k<;mmMz8asjxy%9mGcm48GHyX7lo~!EbXf^RhGluf1iz6LA#o&|JLN(9 zjI6kRRe3d&jqCacowrl=VLlUFpMO>B?6n7mKsy-6z~|IHy+iv<99GzXJtW<=K4I7F zvB5{4X}`}Zn@+kj#Ta5|*=!iDeAE$`wT*75NcP8>RZS0Ilb6r^AB4d5VnGinPxR4Dg5|{JQ zKF8eerWt=jfu@-$ab;SIS9WL7pLgYMe*uC!6^ZV~b1~AYWQSLc-CwYvAs^$$pUsEz zR!V0DU-znfm3ZmF{lyOQ@(@;;1HM4c4ef$)mkj>m2#6Kgt>&5BMH7y8*{T+|!w$7X zId44NJr>FKqH4v zmxR&Xn1X{TpUjRBM2%6G>v3b}?qhNO7R{~g@Rki(FQKBp)-9^MU5BW<9xmD;WTdEq z57wHt$@uF@cl(S;S$?8Dx7EO1^?Y4_y4!91rO?wA2qis=Wp~aMIH7sB=Ihqg-L#8+ zqHT7Zfte104dR5KluANR1jFYouu}wReYWKA1dxxipkgV^Rd7WcsKmwdl016lf)QD) zDZ?ur@Kx$8D+NWZTDDcbZoQq5qJl$>%HtVGE3CSNC6mDc)F6aE@7kT-Lt7=XQ82x3 zMC^K9YWA%&0XrM>j;}(B3RT6~*v~uNOT`*2%NaqW0&MLyVc5xP(CHyA;jVbVF1fso zS$5(m)y?L0XXoW+_<4D8Yo6%VmEq6Iy08)|#NavU<@51zoQ$qceLN=Wb#lCl&ZKO~ zv{Us}l+Ylp{yDXQ$j#+9mPcbKQ5D|wsZVtpL$QlPF?_VwDx&fz2XwnNkKjwTbq4Dt zs~qBR?T3!mX(|yd;tw0=Y-=;2IGM4m-*3+x_qKt<>fTFe9b>aO6H1}#*)Q%<1Hi4=NJ2D_&r$pMRZVQf- z8z!kbYfX!OOzSJ@DzHwcF578?(PksT=NfuE;bl=!Jaykrdkg^#NE@bk-Wq272)c#K zvJbtzz4Ycz3ypkV-qq4PH$52og*EqDYs`Y5)-R}}cHS|u%o#Bq4{rWld;2DMC zzB&LZK$W?Vc}e%3+B}2CuZhcFNs>v;1u`BxWt9ns)q~5v3dm}UePahoDkLjHD5(tm z$7;uDb@f1JhsbU`hzJ`)>CcFGIhV`DDED0rxZjZT-hMivV`kK=b=o&gM3o~i)F2WR zjCsGJOy86NRmEs|(a-cQWvK4MMX^xtK@?Fh4TbLo0k#Ss*nS=ts_!!@l&a|0om~swU?AVo;aHJ5hOTw*eE}wBg4Oy`S&-?^t ziR{wdY6h`ofNaMlME0}jJwJ0N{nf}0#+iZXN0~7wj>;u$`qAYH021NzJO5P`rzN>- ze;$pT@t1xrcL2wX;-8k#E0@1Ty zaJWqg6#oFfv77=@0yH(8=sCw4L_Cv&U6R5lU`$E4L zu_cT)2MeE8SLMhP`y7g~syx|*=o+(WgSvwOI?Q7Y3YLwpGww~9oCkr>;UWtX3_0@p za%l`a+q2mH$ihW$L}=D-;*p+%9G@-D3sdP3q#0KvAl#^34q(h8xEMel zaf()W`R)sGx>2cF10&yswQ3>WBTgLx7XVsx2e&gMMe5#> z$vq)#MGN~)R&}V}q@1kZk-rIvYv|!Z^208N?HCU^IKhLbivYVrb}hNe1}SIT2d+Wn zdxv-p6M#KqX35q3fom3p*BQbY@Pq`m`zeOl2@33z!5D$qB{Z-XjFGw$AQk#bL=~^@ z2mSfftpR=KS5e=a;kf_waEo_Hhy!7~7fOqxasRu&o_b8~eruaR00uC-h}s{clpyp-`TSGvQ$tu$$^xlq%Mfk>-A$N|OX=E)pel`fTuNKxQjVD-Yg~#O zD6(gd>~U_d&CPw=wml$j+x8^6ZQCQ~UYnauw{3ff-L~y%ciXnd;%(dR+<9%TJ!ji? z*U+}T-9_89yO3U+YggK~-Pg2jy8&w3cBj-k8^N_yZQI*=wN3AKb+&iQZ`*bc&i1+z zXM5d|v%Ris+g|VIOs}JKw%6A>+a8Ir2UYla7~A&yFpTfH8Dz=^o5?{Yc#wG?WID*_ zC=oJugiR?SGfln+ppa=P-?LT7Bo;Qeg-m(*9tra~KZZ=3p|feoB%ANKH)Ki<8L30& z?|e_|A+vqhBp@<3h)fwGGl|Fqqwje~WI7U?r9>t#kvUCds?+xjC^9jM&6oNfMnxu9 z{XXRC&(A~qZ+^tHkbs5|EaYGz%6CY^LLeG3u>gw&WF&xN0Ur$zSwP7GP!_O~0GGtW zG<;^^Hi^zzFi(PimMqZZf+Zs?d11*8OO9AFMUpR;tkL9-C4($^WXUE=PDwILa$lM% zv(%cU;w*Ll%=5o%0<45UOAf3=!Acse1j0%tq{8xDk74B-TJB-xAy!Uex*=CR>}u%y9*JE# zu}dm;sl_hAzVFP~6&t&eBlmagx{qBCvg<^0{m8B>>GdYN4rSM;?7H>)a+Y1?lB-{K zRZOpz*;O>Txn>vL-}mC|8l7Idvuk>Gt)6DCn%k`^L?VUigtv0;)NqTpeIA0iN9f+8wFVuB?maAJZeBA{Y|D=N@p zf-WWiV}dcFFC%g^CSRj+H=>SXVmhL|V^Y0uWgpQ2QrRGr88TTSlQA;cBaulmStXTW zGTG**#*+y`nSk_DZpy@|RLsi6uS_h<#I;O}%f!1(?90T#L`=-Y$5gD$#LeGQXeOLy zLTe_>W+Q3-b*msv1Yf7U{Y^>>xHOaB2I@W~u-LuD9{Af!c zYawJUhpa`BwKS3zNY*k*TP#^iCTrnjEuW-Cl(m%77F5=<%354WM=WWeWevBqLHDbn z*RF{`3&=wUtG(;+@8d56o+5c*)9T(Mx8{_-wsl_UyQZqxp3xb_8Yp zW_4iRLJoE9Bb<17-sAoJzQCPw8ueu~KKlz-sJNQ3L`Ekcz_*-U((TiV`}fifOoFS2 z9&7i*)VvRXx0YbuCd4~mg0j?8fl!zaN>R7hcRooQ_?0+sc6r?6F7|t$hm>D3`1<(B zgi7Fblx>e%F%<_>Ow_FN&@qSaJSm;S#vBj{dzWLbN&`*Tm^JVCK~2D9*tiaghzYsZ zAYXs5G?4l7dgbtEz~GH5U~mT)fDo9&{@63psjJwpE%$Ohl`E`q$7RP#mgv}0kfvIV z6tD0o0q#+2xWg=WM1zVNMhg!Ca!kNYuW(J>Q`b=S2>W(qfFMyKmiNa|ozp1M1&?q; zxFD@pvEK%#!?_*-t6uiXhMSK01{*{v@z6S=S&1#PKfD)0n=8W2af_?z48eqKUGZiIr9>ih)OJq0WbLpgfOo|=eqd( z2I~elme*7op8z99#Q^$eT}n(5(ls~DC)g1rv1%3PsPj@nxNH4Bfwvl>O$f!lDq-9V zM_&g(DKfXP2&$O;le8*vB%`~`0D(a$aXjsYS>ETk#t``;2Ht0S0aDl-86dVZ$96Rm z)Lmn-!npdhS@qZW1m0Czk`|fQx$P=8CRJBU6(admq83pI-F2R>1 zb*NagvGcyNSrlN|erq-a^$mdcD`e7{Wxb_E6pt9#qeGpJYMHCR!ah^YS11L$ypxhI zqBw3pBy^pZ$_jRjzOx^9b!7xD>qELKG=5s5$$kmGU=J`q#QvxHUBIeL>v8}NYgU~K zcwDHsDmpgOT$A`*(H%yy~4{Nf4imt`U{V&MUI+I?F^Q2sVmcgH^F7K{waBnx{I}hah5$?!WlSGIkf6~Z#Q$)`E18cs=MdI zVJv6Rc!V}>R!pitZ))8=qAH$3oOZt`DOH71?z#zf*OaJh^k5fp7yyIkbl)?(OVDVQ z2NR8Hq>Nnhyu{vDsTdZA%IdO?tQFMrirnri)GZ!Y?d}2>6u#P@SvnPwvfg_gSN86L zIN%HlHos42?=&3bmn1;EI&NXc6;}9L>3|flnN$UrV2Eqwx=6uemFd_K;%$0bhd78h)i4_*tyUa>+d0@5VF&Q0~(6 zNuZ^Pms|v&yg=@9$xHA}B^!rB}d+HsAH;*E$iu4 z**IC1*d_H$@6CT!q3@;Qak4Go|LeOzfO_s2Zg+}-urOOwRofvd+G;UO>cQmtXU$7e z60Tvz)#4m9Mg-*R+8aC%?$H39{j!MW|D8hpsG>73 z=yIAo#4pJApU!5`u>g8fU>A-{r{*Mx2+I&?mdCs5 zwWQa;IUS=sY&qAetsH16D`e`Iz|QF;F{4qAjNkN@fc!VfmY$;oGik;x>~peByBT~0 z2V4FLIfKN#OSdVXIG1r3E1ZfH`sIe=)p>C0jiCg)CLqw;`>+b1Tixh1twq7=1_<=p zSi6PH;SvfUn3rE3*32fIOQ)aVhK-WeaI@#5yrBcNY_vqTX;7&mn zPEWhn$Wf02?`F~O6~QFEu9w^dX05|4x+?}SVqzw=_ueG0D;*x8FSD1T zUCvrgx~MCZ{dZZ%!%6*`Rg*DywfBb2wz*&F@C%Kcz0|#JG45f>ZVPbE-R_GTR;iNr zG9JdVpSEQjp{>1-brH*W$k)$4zO+1z_o6-kTJvkSU#e+3x*Yyp#Td+^i{j5l2vzD| zAA4N;<2cURR$R~iuy>vsqt#fk^D|m1|b9QHu2Tw5e z^p@RrzWwSmQ~g|$M;UvA+hm{BukdIyUtyHupXjglw&Sx0zKsp-A6vr^B-?;Pfu z@E<9Nt~O`2s+Ob~jSbbM1evd^P7&qSEK|wPJv3A|`&O>jW%y~R?!f3)6DZtlgU=LS zc|-NhH_EXacWAUOyEN9`j91+as(O5E#~m82&$TCnAL(keE-2wj5MgYzu2kHuaj5p1 z%zr3~Ovc9Bq0zd8AhwOw-s37`y>4?Bg2V>waue(qU9=~={jGV+O@k%(7R8n1)v+uc2(z? zu~qcb;ax%2VlH)k`l^;~{_mGY*N5a;>lwCcA8Ou+$3S6Qj~{I@mRPQ(+b>%>`FQX< zU%jyRaLo8Obqr!SmBND&+_u=Xtn*b5(xz+X82q{0Q&N6LJSD?>a+uHN!CCry6%%}n zr>*8eQN~(2v%|cZy?y;wy8-w-o91Oc#~4 zEtAQ<)Rkhdu&iA0SeB|)^<`MRH}&8a`Ldl<7k_l2!g6+g(zdpQd^jo5(BL0TS*dP zenQ(86_0y9?dYTipU#2#2FLr+u(pt6aC9G^vA9U$xcyE^KCcuowfz3e-?O(L$oc(8 z%kO`6%fJ7D8xLMT1PK&WU=Tt<%X^SRK@kU05OYz81|c0pfEX}RfJp%<1+ee&E=0!| zOjGbp!8!%^00t0vfM5fG6R$`H!5##Y5Uc_y41hKS@*pTgAQFL21X2;GMIab}X73Oi z0&)c45#UDvApwd6KoVd{04D&V1fU||N&qbbxfg2ezV6A=9dTNB6)pg4i(gt-$$ zPmn%Q07MxO#XytL4%5o@n398q>e z@c|`B6e3cNL{So@NfhWiV@d=o60*SG0^3XEFp$YaJ`-0B%r+6>@5DI~?M%!Qk^f5j zlSqIx1tdWr$pT0mND_e(3X)uqM1v$9AORuC2ue&qkwO9%61;#w2J|#2zahB}$$Ll+ z1oEL*tr6*xNX7)JClX1KsER~bAld?r7fQlNLI#R65~z`&jRbHYm?ME53i3$6M}j{R z2$Gl z=jHJ)dxHGB?YR}5^6XDFtW4j`LDp6_&&+bSN-AR%pPQ-*Ol973I*Ve~OLY#Ky{r}@ zt!c@H_qZ>j)Rxlo=2tm5iD-}W!Twu{JB#DI+C2$wTe{s2(DG#~3G-9^D{XJ6^F+^T zt`&%ett!m_UDX@T*6USy_BFYF+zP`wI#df|+FE*-12bpG|^0t!*kr zC&I8}t4`fpdpJ~U7ni9pMEPg^_gw4{ zIQ72N+AHQh-=mwjjB8VKmgbXhUlFESOzCm?0Gwh>H+vnSFr5?>?_y)~$aeRM5tmh= z!Q}l~ACBd<;Cj{$e76pGQn^9_Bjzb6VkJVrjK z8j?w_Pr26JdwoE)_R7%JWaYpr>8=#X5f3@_W5&%&Ht5+_=~Jog$NV)r%bXg;kWbtu z*r{(`*mC->MszhxUOlTIuTzqBt!(HjLxCEBsF-r^P0O@07dYUWWkx!Yq$ zCu-j1T;>$kPP}GaV`#e&kbkZ|X!4f@*OsPBrZY`)3{gJY4!KU5LX~3~{C2KL`&$Tu z+s)j!*^$|H11FJ2%ypw~?=lflt+;Ty+#;^}Y~dx|(A8F^{fW^H7V59c zT29Dpxp{uYnKU)$Dy4(xHr~(MNfNcV=um*68wA6Y&I_-4(|vz_h9`ws?c0TPy~IKpR9_nJ}u#LIwws&~S-|1|d_ntzX!d)Lc56Vb2~*tR4b{#^Zd*x#q*)U(_-E9~^(lFc6J*y!qoc92mJCy2uT#uglN%(= z@4~)`xhKOU*H2`{D`;ppOz0Qxnhe>=6R->6fl+T?#o zQ+C8SP?yzzdk`krOw`mFsLXq|A>LQ>Q-d8a&3d}d$Nol-J|{AL3*-7dYgvw9x;{hd zVfSWEQo1!GmW@F8mVk2(X)Is(aGz5s3%-^DD6+EnS(>~XS12CK5({(Z>XrsZL zD&cx3^KSt?9IKy~4U3Ei^uyNjF*Zjg0;Y%c_%L!|$z0alK76m`4vTY9Z)C13ln+Sj z_hGg0(G>!u`VX?^PizH(j*Rf;AS1_tpsBtCnx>Lf6Dd!m z#L?7q#v+GhDG4;gEXk;IhLn>uvmDbX7deV3%{J%I3HjA~QjBRbm!qDC$lkGuecQ;f z&qU0Zg?##JqQ!ZjZEj`^duW?(ZBKg(d(I(rU_AJJja{;Ld1;f7ZeUeko)&D@Z&QwK zI#$4~bN@X#OMUUS!n(CHuD+EgLnI^8uTHrd)(F7%w9g6 zu!GZpI8*1lX+y4&7TfwPxXJ00R>gWYY-uv9)XbgY? zAOWj}#S{KUQH!VzVD|;XE<##bfR4@=Q0*&-)JFs0HKawL4;4Ue4`A*vXF4)Lk*E(U zA)OonG;||UAM;<;&yM*nd!jp0~sn^b!jftuS+BGN}wYfLs(7Yy*2Sb9AFK zznoaOdAiYEKcB&o1_s^%fDLFd3Ls#huN{E2GG|hKAQ@@BD8Z3rs;{>n!-?v2kcYhkF$abIyD_wM6nqZ<|3C5g zepf&e60+ED=%Bm+PZ57R$OKxc0K;2Bu-PK@YQ+6zCgVls`v*LL(Y@6Zxy&N z&b&3D)5JgOCyI%m+pfMQY&7~N`?*1ck7hDEcw7D>ZuOO^?3{ z6(W@}d8>>Q49!>OjvBM_lrdBf&1+nr)*NPz#R17}J9}R|uisKDoS(ZK> z2;@0yK9~kPiz&wH9C>VD%u&(LHTPZnLS>_&=GcelMYL=l-BRGq4|pd0ay+9kKamQc z6^SSzk~*Hx7Z)jR zx>IgH86IAObe`e5;GZq}o+^ns5zSZbKpgLlvkjw+DAmydLI)z!9g<{R>f`uMnR9jF z6@)Ve!x86?--g)-_{it~AOz~aUI@@XvoI}93UYa6#q8oYJR{uSCWR8>UCn%4T05q3 zzRhN(`{av!+g4Q2(FT42^L5RzTT^k;)CPXZTR2G*a+2V{tkHTMAW7n~oUh#A>Fjpp zsC%Uyk0mnp!z6S<5b~uz;9ld`YZQd5u=~IGj@7IS5mTI-1g_3Y0N}RrYWfrPu|EdO^d3s@GQbO-+BEEZ&&ZFY-J9lVyO+&% zg)q}qSmu8P8O^Ivy*yf&FPrUOCxxs3L{h*lNeU||%9_=c!8~I* z{9sO)7lt*oz*rZukK0AFbA*t|lKFf0IjxoCDbg#9ci;rUsHV~l4T;9=_RWduHo~OY z`KTi2lS12gHfk+rcj^Af7!52G31k3ii~-QlwiObw02J%_4fzB<8W9U-~#-OLGD2xfWC-f)iD^5 zh;K19b;#lGF)Zl$x0pJL02W=}VQ6*Gx$iIx>U%v<0S~hNjUEbx#V)snpz*yeC=>?u zJ%&{y5SIC-ra@R{Gf2oXJsbhM48x-Psc-zi5-=LeF#?#uztdC4 zs4wxC$#8V@q%sz^^5$+qR4|qRlI-mbMSo$)k?1boz(VvF2Awa{k-=ODJ60Ww!o%g{ Jw(l~6{|C_~aG(GH literal 38851 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 V@MOwo7bCC;6bvLQt807|^k0d#37Y@_ diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/hatching_legend.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/hatching_legend.pdf index 18ba1d830a5bb8a5ae13f14b9de9da55a6f4f55a..57fc311ee81b5266d8e9a335b949f85abcb6e9b2 100644 GIT binary patch delta 1174 zcmV;H1Zn$^6^|9Lg#mw1!A`?4488j+`~{7jv`KnoAdMq}FF;W#OxX_W#C{(;OIi>@ zB9im`B>VZ<=3)B$NYnFvhxadFHkKA(JV?w)c#yav<6dG05_W`O1+oJ7y(Coe9pDYj zofIxwEpbKaV(kUzFnDSAgJK5nJ6E1kALQ@6zEDWS1cK~>mTG?zTlv<=ZbXq&NKknO z$4yANQSFF0v=*V6_ zI<*_?^=03@M0vUFw-oQoP|t#|s~&qG>4riQNT!l%sAm}sNn_Hsp^!|AP%sRI;8-jL zm!Y0zUKX9fbqs}ISX2emPzbi2t$zTIZwOYkGZ=&g54)Xv63J`xykp23=d^3Wp#`*_BM|nz{Y-^g}cM{0Nly@&~DPsp6Bt1?2%XlNtmgf08?L0znK!^ErhspsLyV zD|O=Bcd(s6LgMSYyR`v@3bYNo^Q1?$ir3d?;m2jKUtRCUdVSlE@`}7%_E(DcWvFMt z+f|P}kaR;K2_#cVHPo|=hNLlR+fYcRMJO1CLU1gWg3D0PGB1nH;5vpvFf6KqX($BS z&Q^fOHw3HNe;EwIf|uRS#mi*`UCVZI8Yx%UCM1V?mYnlZx;ekZH;Z`7oVVh>MYu5M zgYncwG#u(W7^g0x0n3F3u1Pe2yWl}SiH6Z!<6*W*I1KMv0HzbHx2D^ZCodgHly`~RElpL4+A~FUdD`dpBu(c^O_7$) zNJ%;uIA^CLkpVbrDiV9sA5VtbZ75a>()?IUMEcQ&usE7YKiVReOEb5ho_=WN%}@C# z|N5$@0jje{2nYccG9WN8FfcG6ZXgOUFfcGMFfcbWGm~TqcL6e!+zBTsG9WN8FfcG6 oZXgOUFfcGMFfceXHXtxCFfcG6ZXgOUFfcGMFflYaFq13_V;f@}!2kdN delta 1160 zcmV;31b6$76^|9Lg#mw%O-{o=42AbT#XCX9&SZYFY>O0@2u^@TB~VSeXexSr-W712G1er`PNC zcsV1@Fpq*coyj^#>oAeK7r7L+)x}Fu&Zd_YP5YVBt|`JbMYyI&s41mbQhwq6fz?;4 zeu3fzivJB2D^m%qNU;*d6^On7lZpZ$0yi+TtO9ER0Wp&p1S5abF_PRc3q8W1THVD4{)~&Pn`TC7N zL-B8nX#op7!vZQ7pJSTAj7dVpD-oFB8GAuxFq%qJ7 zy$m)|DsZSXIJkeOf(2c8MhNa^kVsw{uJSU#q7gXV6KolY!;)OwGkSTS!!UXCID+*8 zlRrHd!E%Yo2VX_7nl8+G@!bekQ^%}o_rO_AFJ_fbfwS6D%vxR=oaNTWtPRM(X1#SV zYl||mSI*%4nck|2jOnJY8TDw5Aga} z`%vba&-e#9{sUDWs1K9C1?2%WlNbaef77v!8!-$7&|Y6LKOjI9B}#15q|ZMjX>OZq z?)MKf+~NQO=8nDIk)Av-F!1Mh+>)EHN#hH-2)zYng?uLe6;QkcP0rN zTgiYAJZ(+bm`vuuJWMt+6)eof;37kTVH%#c4e1Q*!Y+e_911pUGdQ?M!Gujbe=P>? zVvtB)IDVkc7rHhe1B>#VzHnPbnPOyaH%9)x{?iN zPY-lykixZ(KYaR|IKM0(&gHXafBA4OpS8<}a{;YeK%7fxze1dgXs;sTTt@qp5$8gR zQAnJn6kbd{U#8coS6>AALfY-FTnc6qKu zr0!D(PeSt*$|xYMe;yuP`DllH=x~>hcF|pbfY-;%hcZ8W+OPHvx=W?kvquOB0TnbL zFfcGMFd%Lq3NSD*FfcGMH#0SpWC?cxG?Uy3Cn+=_FfcGMFd%Lq3NSD*FfcGMI5RjP aFfcGMFd%Lq3NSD*FfcGNG&wPoEDB>pbrG%r diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.pdf b/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.pdf index 1d14a9d2f60cdec352fcaac5c33819674e211f2c..0342a2baa4b2b61979ab263e2c21af710d547c2a 100644 GIT binary patch delta 4337 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 LNJ?sN(?R?Xi7oc! literal 11426 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

Jk~xsG@uXjr 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 E1B}<*kN^Mx diff --git a/lib/matplotlib/tests/baseline_images/test_patches/multi_color_hatch.pdf b/lib/matplotlib/tests/baseline_images/test_patches/multi_color_hatch.pdf index e956cbdf248d58efed3cf24c9526a0b3573a7eb4..a9db7c30998ed6f31a4414a6d0ec1471a4ca0d8a 100644 GIT binary patch delta 2887 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 E3n%H(QUCw| diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect3.pdf b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect3.pdf index ad98ff7223ccf468c78b842bd666c22aabc513b7..402ec545847df00280bdc341c7aeb4e43d6371b5 100644 GIT binary patch literal 27738 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 literal 27653 zcmbTdbx@o^^FJ5}?!h6rJHcIoTku`ng1ZykCAhnL*u@=!6WrY$g1h@|-uJ$Dzx!R) z{c%-YpLu4spYEQX?w+Z7W~r4Wq?p-QIFYE!SINMwNNi+Z$n3vcAqfhSv8sDGn3A!I z8@U+S*qf8FDjS)bI+L+O7*xrGg^^6{O#U(Q{x2^m8@afcI@ytN{fCED%HGa}jN`x0 zlI||jYA!}DrevJ|9Z<6{GO@HXC*%ItMPgNUvNu*Ubs^J%=#h|u=r(nCA!C)bh3FLf zKU?wtvy~;&BV*N6`fg=v>_W!#A8G%$Ic#4b1OGDtRa0ksS0`hL)&Hzih0FzFk*S@F zGa281wMskLyE>5l-*f$MpH&T_-^s|%*}=%k)Xvxg@*ZSF!qm;u*i=uVn2m3!OzuMW^L$vAqdshA@%;o>(zkinekG%?}cIGY? zWNiNy0b;F`r47WLkk$s`HwjZ?dlS=tj(2u(GBvVAa?d*T`4&qp;I!7^+ov~-yg=1C zR7`3UOYUwIO|luX6*5KGK9#5AFBN)wPfXi!4NP9vS-}hHKK6=`g`*rajB`xWBJuNO zjNKqv*qOL__w#sZ8t^N9e_JaQ^i_I)KRqol5LxffxY;;=*;r?IJ)VAlJ3Ku--|)RZ z|8*du7QWG0A?N2_{FmidVYPGDkA)LyhBRb z`TPSXd11gHQPj`(hKh>o;bE=wedqlt%--*%_uS9J`+2`fk{Q>o!)8`RzEtW+>)gW0 zDe+Zo=CpPFvPtFAfd2ljX*QWgujN;R$nIOxT6513PR#v*cqfg9X0g~AC}{@?tp2bN zd+ZZ;F^RcrlL^*)^~q+dqU<6(H@11arh~~H$T%;?opuvAUs!e)>1hAN{X;+lir1^` zx@NvmO`~#Maf@{FWAd&au_Xn`@vV=efWClh-KEF@0ajo&^Pc$VI=NZuyQu%T z*X`l>ABOeML#T@k<^{X@e4v^e*2F#*$dy{N5qv1H!t3&{RJ!Q=_PdE;6s3iW11|@) zd$p2hYoYh4q1oGSgCg*ytkZyL>-6$&y@lsK<>)y+#ytP1?ttqSEc}BX@Cg(?UyCbV zU35X^?GfBQ8pu6hxfqXndAwK;tv)gDIRC4pAR()e5_5C*F5qa=c2*%dUgAtlcd)p3 z5K7RvbN*R*Z(r`t3rnE*?(SLT)NE?pOJiprjp)q(=DaO3YUXe7tH(ibGl1PiadqXG zo3Ym7wdJGGEvv8Py?t_8f|Hk4F1fa<&ylG7tMzKmqPig0+w@S$D?d3=o<2)z4$aRe zEa>9WNoxQBe>9Z_5`cjPDJUkIeJ+TNj4? zZOar?-c5O>#JA-_1L5Y~i4kc7kO|1l{`3FH7&QNk&w1sNFOn%QMCb6oor<(XF*IKon z2qvlNSBj3?LnJsSAueJ_8NirYR@{<8XryG9?a2+hJ+`RcstNc*jw@0$5E(|;Qp{M8 zfN|uB`zrU^nj?@6LYR}V)`}$8RCUMf5bDu4`?_L{f@&l62X?!&R2qHAhZUXEO#7$C zAF8d+COgwrSNn|>83zg@X>HGngv12{+jCv|Nrx%LA+~VWP3&l0(3=i4Y9#W_#8^R? zu56v?&bVa)}AS>S6}{g;7>?*V$PjROqrsOXk%woSf2Tb ztz>QvI+~IB5AFAak%f~&++jy38aLYALD-R-u+Y zq1&=bj$Q2|fYqqiK4z}!$9B<3SWggJG`%(KpOwmq$xi9do5R$}-qN25t&2Q1EzRD& zMo$PU{(*~5oxMJ>tf`Jc&%sscyFIal`WG>2|BaZwt1cSt75Y_#ZZ`=U*@x?DUt&~l zGk5I_S`vsaOaJ-ulS();pg-{d?f~mvai2k#tE{1@k4lqH5P5^dh_zvJL-6e|zdM?U z`*p+|Ucr|n39W{XL9SF!BuDZ0L6t#P#E?PJDy@=7(e1*``^LkKd`#T-%W>0hQ6Jg% z&Rx$`8~di0uZ+d(?XOqIJ3rpzfz?kBx91x)W7$)3#GJ%~3(*5re)o48H&uSu54RJs z?-yX?k5KD!#gbj<{kvg2%$*gk&$nt&NMf@}RQS2_UB|np7A&$|oqEu(x6X)kCT+qp z${mwmZE2Y*MRcJbZ7~DXcK`w|7*Ms`HP&o|zNHC2wpHrjXkvOvX<3Cm1&9C+n&N#(sE zAU-t7=XLrrK;6D4ep>99?4}i_r5aqP@*Yv5#$T-Ui_7!N58CxE5oj>Tfju7Dd1dq| zb=b+UNKHw&OB|9$Js;}E;u?LILp?Sq+IrYg`dpId)08{PXVpAOl|5bi!og+hm)JOy z>$l8n`SNNdl5TI2&0Vgev+wtJ{?>lk^W|~BLdmJ)l-Akqvg~Jl#bdOAYHRQEt;lOV zAdCOzF3}?tI8gJI=6#g;c%%OG;d(-cR0wWa!`TLa%GlyMa{1?Fx>NS}a6-hM`1#k} z^&@r57t8GTbe)Ax%j3)a+zB=!28m;X`?c>s2?BRCeulzWBy`maF`LKG&-QW#L zaW4z3V4CSGgwhe^@qo^ z%?u)tGb$q5nvCKT^h))6R9z;L^!ZLoh2j*@A5l_*f?l}UopuJf7Y7kks*dMLUld;Z zCW>O!B~^7e-8GzkrhdaDM%-Crei?g!KXRD$F+8RbdAoQ{-FbLlcf?*36se#~Rn=`4 z|Ahc%2UO3e2@0|+Qob^sjs6hE5-Jt!<&~mnSwQWlpKWNNL&GW+t7EK>QOtePXYC)X zC6paB=G^osM*F3I9xV>n5(8b34?Qz69crIn`CgBY!1;AgJ@ioR+)v|*Q(|oslZRpiImO<2|!B}6!`s`0F{A8n!muE$<2)Q zLF`1Mm_{*VNBdndlL%e45=(I__ZZiK0R4q^*GRY~7<7DpS0<>(E^K^B%4lSLd^35Z zX(`p^)?eb7C$!k(qb~!frG|&@mbIH9{T7&KrqBxUNK0o{j0C~9(7jv2MQYgEoP6qM zCoHu{(69XD|_j#0Bn^ z(-hGS;y{AVA~mE>Hk)ZY-wyP+5I5?phb)wE5~t&1S|hvWQT8&bH?=qqJ8yrIEZ=(L zQ^yR`F{aLE%FTSqw)z3Sqo6IHGlLp@%|`D@$j$_2JS9(N;zCdGM@A%iivKkEi7}6g z+s+OaUeT9=@u;f!H1@aqjxu0u-o>d7|1FiNI=6R7MF%$btEOWK9O|IN(vfdyjJ}gA zVS#$&F9aPDLgk0y6*AR~M{9}DR9L=wBeB5+T8TSFYwMHz;%YP-#yM(i@edTpTvh2K zZu-%~AR>n(Cf4t1)c8w^rH1}I;Z&PpLZ^?Ba^Gxp*vnS4DOHNeYJ-%NG?fm0N$k6MB6`0mjNd z)oc!H$Awx@$GTa>vPKBIbXBJY#BP64iAP zFwL(VJfswU+D2*_^Zm$^a5G;C2z}%lQR@{{tOsCW$l>lMJ_Y8_EIUtp#Fka38xi*lLJ+Z2!U$}&gL1~0h zQ+lANqEJhp)V~l}+O`ZsD6S}E|1gB3Yo*XbUy!CtI2E$kj&p%*fkp9)1)kT7VB(-j z#}E4bEtn&Yagsz~Ituzhw&IMkCy9KYvHlzTBb}Iu00|S}w-J?kgIg*yrZVfVZ0vBD zN3DqrD4mC`)A(uEg{bT#DWeVEG0PZR%o-mL!?@9F_wjobee5o9+@ysKZV|po+rEQA!*-)J2$)LD64;MNFOcZM8hbE zp&ZaK_3HMqS)CfU$HCiTqW7dz&7xo`fSyJnnC>H;cMlvYl0QIOeX=Vh;2pXsAEQ3cpMe$jSaFP^mbfc@@PHjoa(OjRl z9$Ei3%!PhT53bi7eY(ZrJ2z0L0%EU9jvfh&vSS;_l?AQBZ7=llj^!@ zdCMOYF6bgKf;p>?f}_aEkGTqw`2l;DxF%Ov8(95kXe&V%zy`Q=m&fR`X?wu5yonmg=!#CjHuB3tvk z92zwmdvpKP5-a)QZu_{FK`sI9iRz5wOa4KLZ=t+JjUAIY1)wVy456`6=R=t=VHSg4 z2b2wIg6+l(n?2uEN2Dp!Z*Sx7#W;JI-n!q1*FRlqSzhe~Msrl`PLD#--{VsWIAg?t zgK#@A_)|oPyA=n3c{lsh*s}K{%LcX#i!yjfF~vBBKeh^{Lz7MO@O?ch`ljPzjP?th zpV83y7LE~EEzH$!43%p5xm!%qL)Ns&fBGfD1Mq`fR(copUopyyNc z$pZ-+r$yK5a~OnU%3(|@kAK$x?7mt22!B{iEXitsh)BC8d-&Q>@_!H-^PaUi`lM~c3++mCb!lZpXU#)JAtx7&Z&FX! z1FrIS1ak_yCE8(fXr~TMNLY7s=8Q=TO;@`!v)`2E!|E zxY7@2tlO({2l=J3X4u`PoWD|X*vNBPlPz2Vld>rqFp#1-jbUjVQf_sgp?DFElaI|U zlD}d1+G1O7$BUc=sUk$*Fbs_)MJ#=`cidMrKe<$VzdGy(u`;m$Mj&mF0xM#Aea*1N zx+e8Y<#G5-r;<(FMYT!go-?O?`P;-GzD8vE5sube)D9K*bm>|hh{xR%*dPgX)dDtn z{RgFit~x+hng5_Ca4tVNAq35C4CE9MS?LGNDbW{`a(V^`{MF3WziZs4Ulk zs7(RpCjUAb|G^(7fT|>bP!2$nr*SV$wNkwf6ksX|%fBv!H8+YfGn0}4IOPMkzQB}0 zv`YaSgq*6VPj_4MbKCmDjJUuIjniNIm;9|}`f5SJ+CUtO;du*SG9H)6<9QAMc3p_o zSPKxdfnQS&B1_O&hMZ}bz(}%OV7XtW01xfwe1qF^hSE~5V`WOc;e}$3FGApqss8-~ z>RJ$~KbH9g*S>{_c#}B*v7sDPeg^O=)B-SVk6nLD0rcI3kIG$_Gn{1s7phDFpS`9?j?+kSH0&+Rz zr2sBAhX;^r zq(%+MCErd7&hSi&dRdBl_@WtO3Q*c5i!Ck`RPmsa4J-V)r6u<5uOkDkN%Cc6;r-Uf zfi_DidywqI#ffocvrYkfJ{byEdE@lkxx=) z2wRP&khn#L1g-fl?vHWM_@G3|G-X1H{`t>cvlPQ!3Az!>b|s&~95cnBo~}=_gX&uM z-lkT~I{F-li-OPTPt%ZP^IV76a!8*%&Q>#L9dSS3%Smp^{{3juoF=vIIbAI`9)QZr z7vD%(^}yHaeCP7_zAVeSN?!TA?$c_it{wFy8gV?rwkh#r3B=4Z?BGtp^ z0Bo6x%mJA;Z}BrVczAOm`$a7x*YZ&OQgwpb9Bs zm@rF2<)(ldJ4m+C%#}05EOLP}%=@RykIWNgVobdtt2zw2JJSMWy`fJmY66p$M?e&@ zkfirGSEHh40!QqikAWycYINfpvjaRi!5K{)-kw!jbGohWz+`K;*;-I}jQ58sEr5)z zPm3Tpf@B%-3{pfrMnEy!(koeRb>&w5KZZe=c3Oa7oD4wUlHKie0)Tq77KE?u$!Vhn zAhC6eu?Y{x?!d6pn$xN7rJXGnNnMB3#=Z=|S`J{(rxaK%1RgFU6u@g#rza(wqqQk6 zKSFIRKe{VtAU&anEK5hj_X-_g1JelT>_35$1HmkSP&^=;9*p#_WP1XWM_nZ&rXlsx z6X;q}enb}!AkG0$&vF#^)Cp zt4byS=h=T)c=JyKFIeuUIRL_GL^=X;8w15Ksut_jfqslaN*GBBz%QMLxvZ%( zq^t$i)bs$%MnL`j5z0ytf1?3sO6!_y4scGe%O58|+_=+qpw=2fp;}N!4Iw0t{^3<= z&40FN)0dLtqookCHmh4)e6Fa76WE9@mfgXts}%p}OZSjN=#9 zpRFrcxMdL8-7d%Uh3$;fM^V{j^p~>+aid^P6A7rX$RPiqxwtT7QKYjLqA{AQWOX~k zPO?GaOek$G=!d`TgjYi3i{DUA!$s1*28Rg+xo(qX+!L#l&J`@SDO5L_v_e;u`{scQ zvAQa`i*<-ezatqALq$<)1!+bsl*%-Qh&<3+%=a1Qed`g>4_~|d#E;^{ry zl9{_&|E(^C)_kUpb`jo=>mL3rN+0>PYake_ZF?kY^%x#Q5cI3dh!@!S_Q!Gy7XxoA z1wk~Q{!7$8HSN2g`yDl1qf$uNILkm@dkiRuW{ntoPVd^21zGV)Dz|yOv5%x4ibPs_ z!?^Y9NU@>H%(H@j{~d=#U8pQhwG(Nz{U*dPya9dg@p)2h~b~I>=JdFyYr^z@mPK!t;Urui`*ueu+ zHAo}GY+DwmwP$w~R*N`?<|pg<4hbaMgJca$?v*xwOu>wFGX}z(Ca_^Be%|a!aFKz| z2=GuBTr5EghIc5!Vsgmg0fKM{h5px}U&ZrkE4*ZTDmls@JrQJBQg`DYp&JLN+%3BBjk;UMJtbuPx6OMT0dQ zU=E%e`?18a(G?)6d*c`ej=CR{KrTyKt25**MFDf;Tj(Odm00iFRcRHi{N;*&P~8h& z2=1S6CsO5E8Hu(ku}n>-{80}4@S{y@NzWuhjDG!Y3s6`&bW=*yzK2c*N(N4-LRmv?9lg#sRz8lM=epOF<=~MIB`bio=aiY{an<5OAiPQS%TLuNY+) zV%6DHU{0S@!+NN4P@M-tP5V`(iktNl7k!J<*u2<{jgea-hxaG4O_HycvM&Fw_Fd>9 zWbO2@9q_`|Af@Y<)B<;3A_qM*k>d8o9oEhHb%~IdlNoOMD!=i3CtMJ1cL1Xi@}$9X zo7th*BR%Q?Z%T*a+}^?z&2tm~RU!!T8HSM<|53gH#={w&HT^eslV-@aUd}wSmXyQ& zr?Tni9I9UWp0%(;rFX&;Bj?I(tS^mp1T%U_!s!cf?Mf@y-ggf@Wxck!wT>U=ii&L2 zFKkIl-1>nbc`f#nO-ydfRggebbb=+wk@4Yj2r^!&z4Wov{-wR%v9jgzNiaG-h%%YUl{!99dyF#m z-`9;UtcFzZz)78v!2%=e;|-;PLZ5Ckc6}eL$kL{^nwhp7c=Kn)VItBeO)SL0y^9(ud&E_JZI#slYKx^;J%V_6V zv*N52-GE7e2VdPB2`3i#g#f=!Gg_lFOG%MsiN9fFhZ|-H&b$25=$EgWTm6X>H8+t| zG`B-9DnmDL{3{winLVEM&zHr!1_IKjZDR`p%E8E;k4ME(2-E3!x>jPrvAPz$Ir6C0 z^!8lj5uSD!Ra1moOoZqsqY4hs743=UB~JoFB+}GWed|-0ZM*8+H4(kmFy2wJHZ1GE zagYPUOOHPc>mpL^O85ZJX)Q#kE1@g*5B9v^$QpN9+dMu+pj6RxE~S1T4;m7e7H9IXUd6T< z!RUhep4#tG=(*Lb?;G|Co3EJFdSdJKgx|-|# z)*HNppgi1oDW7-}8eU;3@T!hUVkieLMsV~2j}KhX*ReSuZlBTq-hMf-J4ACzbeu)q zy@#?~aC9+fIIzm<=s{piCAP84PLvbu67IL7L=lGDepUQkltdI8+?(9A82z~C!NtSpvxS@BRpl1aI0r)31RN-zEH@I4-j`4@OjjkieOT9Rq~l`zMP>A@ zKZ);zV>Rc273?34ck3;cxb<;F9az`8RZD747{{teRKNmvvQ^!%Lb4I z5AU8i&QiL}C5gETx5ng^@+R-G%6Gm>Az5sJ>mLPG?H+gu35B-mXEtSr%YV+JQqQPM z9=D-H`v#`!_NVaXw4H+b*-K?Cd7{r(xJl0YEptuE4B4U38=F4FL**d2q$}$@(FF#^ zb-OGhIi(tA3l+A(#=4O}kGFY1`{=mkrau}TY@9WRL#?+A zIXvmkAuJTSBoa!5Qx}(Y7jnEXcrj{ApM&z}n2Et5^Ix?HsIzvto+$Ok92qKDZD` z#yhy6TBYyc^cpC5=Sl1DPAUj$6fW^KN-KEnuvH{#c_P1>;qF)|x9Ek_Un*Wfnl672 zqF^O1(6}cT{ThzC-=MqHs;{gde=RX4_tujV0Cven+e5Nr`{!;#G|;dr)z{6D#e*d`}WkZXIA3fcTA}Bea}v)LNb1!Pq=&m!PRaImqomUWgLW_Lu;b z@;0ho*o9f=x0#1KLrLXBvKW2Y2<}7u&;HB;Z1;`UJK&5A(O)ibDh|9dGDL$@$mrH#k2$ z@SRd`LIj>jqwV*Rl#{U46Ub@c;g5AOSnpQT-=*e_vD9>{mMV~*AA3tfO0D@kGF8=m z?-*Ybwm^0k>*m`!Es|2o$ka``;O7Pcar&g1z*4vN0RMaXgeqXMO4#XGWM+!kDYM4_ zI-P2vz>$pmX>BGn|KF)EWg|XbQr28v%6VAC`CIJFzZh!6K3b8K89sZ|$HYbQHS;egtzXYpWjbl+hE>%N5JAKotX8dr zOGr1&4zHimmYv=&S(X}FG#d!WREF7MYlIeYevGo1nNL}+*Iy2LWRNhPXRsIq93)5@ z_uUw>(M#?4B+#h42)3R}saf(O>IE+p`$8Y9*A=I`d~dbM@>3(KvR1BQ_sYeUofuL6 zVr#RN#dUQ~_T!XeMxl8S$qAUhh$f9#n(5wYZ$6;3-yP9C4T)*hHD?afYL|^~wZWskB(5 zj7xAHbThp!z&Sm3{+og5wInrg;Yl;YjXp+d%!FIq-f5D-$UWi7s`RXsWPP$I_OoJu zWD{-~t637)m^vp+BEI4H~1C6=(z$^{KSR7{}I(?MIFD@cKqqkaAYAfJtL2eZVr&*|8Q^ zPCQwS3Tir3`@BAJ09Z?9O@-g)*LYDpktd(^&76vCx*P0nH(|r_aipdDUU>R2S5{Ac z{XMR-Bpfg*smv)%y28qNS^C`IA| zbBtyCO)ym+mU87&4sEx#BRp)JY9mxJ@Xip<^Qs+grX5E=1-RPSRPFS%qeW+dr?VY) zye5o4$65n_izya1(=Wr>+n#T(-g!gcZxZ1%6cfil*0+BcZH*6&>Yhy!N8h#k`)-WB@>=ohUeowY?w+F(9d{+~>(s+lmGHvx&*Bvi9uYOLma>P;} z>RD7#O`d4FqTa65uGQrx)B9Gg)9JQV?&AM9x$9B???ggh1%`o8>;fRroKIf^@&AKJ zAbg~g5XS#Ey{}YaZmON*KoTt3$D`&J#eK@4_ouUdAuiij5INmnD^Hqk&X-GmdaW`&|5E`pOV=FKmL6r=F5R|XT%ktc3*AwFu;Qq=%>JHDilz(n-?`MtFAI3JkgWl=4BAp{}NyI)Q^z|tVMH4f$Bt|c|2KZYf8s?nv;YlVB zp47Nt@Mm7PZ&@z9>JE0SM*rWUA@MaSmLy!pRgQG*kV!FRlDu-ew`e8G+YjYBH)#}~ zXL-Gas1|xjwfLIgCInPHG^xaDL+p#=#pz;agIu-Hi*nyGb6{=@cj^)Y>?UWrp%fcz zy=i?We5~Ehf4sRp$zGkl&LVy+$PH~~a1tu1nl+^3rjp0~NfKO~b23DEX}|HE>6WwY z!t#k${-cEcso9aLd%AnA>(`@NVS>+OO*?unRI{6L;3HrvJtxm+kP>ESypzFd#{9m? zjp~=)-13-5=z^`WlMjxo?oD1>CO3&&P{OVQakJ(@Vr(re3kFu)W&Bj5!0-;LXQ3r6 z_^vVQmpvY>;+uiY=QslWO(a%Bx(B)=*p%4r?L?;#JUTY7CXWECy52U?_Gjjt5q{}0 zWC4Xhm(IP?Nyy3R=TG;IQz(iM9HB8%}NvqelQC$B*B5 zzqlz^k!PPXsFaRwTv#z&Tg22LR}N)+zNnr>>dZW4Ma87=>yr&L-$ScVYRc^`orSnv za65}DDjS`xsZiZ7u-msq)Sgt7cj7& zjr0U}F?I)5SUWr7GrL;Y&%JzKe>ZKsN;Am5JzpMgbiU5{z462vyuUO$68=6aS@SL& z{xxav`td#AktP;e!o*|`{e94{Yk%3YwEBV3>?%ye3V=T%-GR>F=YB!jwaee^6U-s} zC_V+6UoRqGo@{_Os22r>!d9SH-*L-pw_Nx=+@9L6JCugI@!)l|KVY}LpLM>(zCVh* zKcxB<`JY_=epe@Xe>o-HSik80-Sc?WM+%-j2XCJQiGrzqLSP*Yf5Aa;SZmXZR6(00|Rdn7%1Am z#I}wafsUVH+A846M|kYfg(>xF9<2wX%X?CPh*k`=^NKn8b9QaR6IVH`F^0^#^|lw?{fb=vi!L%fGs;`x?R=BX@J9plYy9WW zhjLjzP~LD&y5}2ZlhMA*Iem8%OqSg5+7VUDvz*fXvs--hc>@v3r;&pie&+tBBfaTf zc-J^PtpoYqy&4|29Z%v3g`&7$E@iUIa6xDVsT2;6XK~5(YdtB!c;mM@Zzv7&7{}AN zC#!`5M^W)T{+AXR_gd>}^vwyA+OfR6wM)w$c-0rDJSfvZ@J6*(-zyYn=;yDIr$5hQ zxk(b6Dd&&|u>&04zmnX=Of$&H2j5wV8J*U|3vH={Q=L!7mTu3Jcu-;1wqKL8Z>-mn zlL=<|57P0MxNF$Z)uxVat~A#U-+y2376Pumb{7+*Q$76o<&B_0@i4}4EEE3)$!tG^ zY-}qNl-Rkf#XGh>qPRFV3bk<(#QHuhYOiE=9O-;sghpb;fCrmi6inG$8(`5)veP5S z?V_uOj*dPOz-TV0V>mMHf%NHDFXkVv^uGb|;SS#6iF>-WD=_%VRQDfd4Y=Wi1Nk0S zO3KT|!*rPv4$!yaIA>ygs0kK~(a(OLF+&gQeu3JKC3rxC{e!zr1m-%_h}4ZpX<5UmeO%JV4kURbK6Z;9bUa~NMN z>=}`PKHLOq;i<1W)TGktWUMtC3>5hC@73Jk(V>QoKG!(#)_cIpAMhs3S>Ox4Ji+9^ z8+7LZP(swGb9)_(dS7G%S#>M=LrNc?~qHZ z93-RY+nw0H?3eqen>-SHVa?@BYDt44t6@WR3Ri}8mm7uU~w4XZg zewk_fVIyLwxeRa$;E!PfVH{nhwT$^BHMQu!ln@>e_0}6X-@yC=4yA65JEao zI#VQaI^E|U^u31cLt9zpZ(dTH$oVAr4!(-YFI|njY9{zEmTr1w^FUi-Bq&0bl)=Ab zRNp@GJq7Q{X2!n3Bfth~t)q1sQx9*0>>0hC2{kSaJ9~bd(r!%a-c?51+gIbVC|tp6 z=%515E_?ucfNI6Zg(-J58bqnsW=dIk4hJjUvo$%$7qiVq zXkuU5QAyjq+K&NHp%}o1o*H*{DBLc6YEg4z6?n3)n&#{=BsV&*_+w8(ye-BDPYz~_ z$Q0#OYwJec*TDmXA&~_L!@JLQ73`H zmAf3zXx0fOWj#`2T5cj8z=OYsHkG2<{s2$GPI3;-saD?J$_QCy)! zI>P8b7gYJsghe{Vc5I{d>^kkVBkHv!sHN4f_Cx@T!NCo-&vJt27h}P&0yo^!uSosJ zW@xdQ=Pe1WhDblXU&UDAnyHIIjkG2F;!9{}P}-Wqf+Q?LfutGY_$3{9K_rd_g(C-e z8r@QH+QwI1o31qkR}$c&cKO!$VX;R%DZYtBm1?fCpp7+-FDfO>i|XADLS(a8M^-rk z>R*$|@0WtNk)s!#u2!3w7ZA^6#6&ISK;R&`%bdJOd+rR5S?7StNaawEm0vONOEu_! z@FJpXPRod9A%qkr!{K!O79C3&y6t&mWDP@e@V@6R0Q= z$pikVp@Ki1tMR$VUFcNZg~7b&)N!N zg5`|IQs4|VjJ{#vVxgtNnc6j&tq46t(Fhm1a(s~LOUj@BVsH{j*H`euc~;Dt&19%Q zv})7*Yn1g7^rFw+rVC|mOm?5tf5&>GM3lA<8)+c7z^28|Qa^MQ;5DH9DGa&QYiLsp zqpI7!t8lrDRKLl=mW2Kzi~x638}?V-8+NTJj@3UnO`ki`s_JU$Yl=i!BVQ+MAGf^n zkSkw-xHdbmH4is|K4=Ep`4v*}$>V7H4=hpqJ3ESz=ZNYl^QpN?8U*^j7wbjeerLNO z-(Y4f_$bCrQvfG49MB-WkL@thc>^9;8IKxD0VG{98dkSDdGKi|r2(}h2T*Me1EwXS z=!iJVuU;*%p8i9RHmc?@o`bW2VqR_$H*q=yuW^wblAfrnGcdG2+=~{>zQsw|V+XD5 z@J)XdFvTN$YoUWhNbC_2VoMZ7r^<1FjImADNP#Z%f zvcAb}XPFkGPPQJ9rW_Yt`lmiV^iwVCxrP%-=une2`$;&yuU{<8WPJFLpKmAnQ#|wNSRZ%c-gE~0 zF>T!U6CRHJW17A1cW_>x#}6iXC)z-C1Q=&E4a!jJ_(4cU3oc z{fw@pHUDyT$-bC)uW^CUSokfIrDfF1C}p>Hjz(hFJWYTxbcle^w+=yHD2tu*MGn)F zQI+%b54pnd6csPEPRFWdb;`I=bGbCRY3fC-V;<$W5*I+j5AgBui)}ye4M7k5CpHSgZBi>F>GDrNyqH zW#cK<&%*Kdksto@x5Z4TRG((%?EFv$njD6Rd}8C@W>Pi%d;+;;mgX(elHbnNY5fWD z)X5PQO$F8qn^|7`fKbytQJP={_b^lXtLnZCZGjEEkjeL*A1AXd#*DuHLvtFpJ=l%@ zZneBCRkR50#@5S(Gb4^v6OrQ3Gx@fG0%&u6Co0FyHcQA*aA%A^#gS#%I$Y^vYZ;aFWpW@WB*@S7cr-JVrxT1Gm|zV%w5LjB}MIVL=r>1$D<_ zpRx3Wrf^vJ#Db11*Z7u-fx;m=p+Id1=}`{~D#G$YuH2ImnPVDB-K^5JOWq;RBk_ZR zC!0q?3Y-$7(wfsriNB~gK*e<0lGAU-?`MYXUiL8X)da@SVsiT;hN;(8HRlw*dn~ZZ zUz*-cneQPxY;yF2N>!SY`u)YJt^0=+HbIXjp^Fr{HpUFDLOBIP;J47Q$D?1^pij(2 zch1czMUqvSFvC{Hx-=Ay>zxx71Cx8*V*D5UnsI5laF)2QGE9%Yt*hbQ5E zkc7WLU4n?>^-9p+=^X=-kfF!U_V(n{sHo($(z*0fMm8m4Vh%@zOb#UxNoQ1EVzs}A zrF7%lZIt@G`xd0(#zzT0F@FgQ1_)kfRuIpYacD{KJ9`9BvCoy%OBVOqW{%os65UJt zJW5wQO2?6`M?6XcqW=iAV~Wo~M%_!N1^#9Ojbn|d_|NO9L-T7ULN66pOwI8W!s7|6 zc>i{p0*$iakW`Cn6?G8jEjgx%Ws@{Z*R)E7G)pPjWV2lfH;2mA!o;sf`I!gkEhuXg zKXzydfF6<7(_NRdUHOAtwX!or^9ls{u#a0hjvxNKM)l4X$0 zO8X#8fiulugAQSlpAvD)zg#~6{USs@3~(F$@}YhfA9OpJ9X!N=X~!y_uO;NJ?Gx@^*LX5 zzPGL>jAC%V#?DAkQGUhNMATN91An1;F-$tSBAchfagP*om4wARC2a3F%Z+!DE8=N+ zHiYX7{N*cm*ExK|=?T1_TrP2C#xSSPH~b`B_LdT7DCAaKhM7?;1ibWvKJrB{d>2#1 zHxe2b9#>}Da6E;^U2fSt^K><~jiiRK)2UNZSu2NkwcA6k=++gdvBfNr`dMGgr`%kg zxnMEqQM+2lSfxx98$OU6QFB+x`S z6FD;7)W)cDK>K{8RBV~G7PE!MA=0+YUGoeD6%&=80jrGULk>AIdjo9~Tjy<_sxgId zQ+^^%jZFxs^;aFFj;d(KNHqSK4g<1!OeH6`eU0kkT5O(#o_B{c5(- zaP#9bLq$ykL1Ag5)`?O!bDATw_H39k`>+aIK32$$R^^Tna@Sa@u_Y(kAg1kNW8W}@ zfL9^lB}_09m_Kp2&|H(!+J&vj2`QeBzfKjsl@gVY7pZ>=&=+{?3+`ziNfe+-UL{CH zg%_)`C3Ou{*lHH*crayXN?pX47aH$4K8v|awDB0|q^0f)zL2{hX|ElU_vCBYy!Lg7 zb?G_H@sl~Z6h}d@=_i=T?PT8P`l&SyEqUxME^C)0zo}@UUhv(PB-7%`3`_IL18ejL zUO+bz9L2u70qV%iv_96;yTDN3xc9QDho0cEwbF4_w*H@z$7ahHsdS!Eah-GqPbWIq+eq*@ zKK14~IT1De!MnMx%uM_-QNS}>W|PgtPOy^`9~OL4A>AvAPCJXAm(_aImD#oJ*o9=? zf?YDP(xP&vh-%>5q4Ca^`A*T*f0YByaGkO2RzG*)t2?vS^K^W);y)Nh*F@>0E`8XY zVOzAFrZ1>VzkIAoL&#k+VV`z^?19p_u8ie*lQddy6Ua~SMg9pr=e!R1SHDtFEe5e$ zO|FX1^>C3PB?`Z|wX^vKG0w0jEJ|FASvY zgSOp!KwVO?+xOcn!3)78y_ybScVUWRyoHg#46L}T*<2yl7b(~KBZ`N-gxmw1j&+HS z=bexydAc{gG6~J$JzGnra#C7%$rt&(g|AV2fI}}5VaY|mcTf;=NkVQ5M#b(tKmP(% z_RK7&N;UROLxHA|psrA1kHAYNRbvaw%Vr_hFPW58|O(C>5h@f zP-R;>*Zh{()>|3O#UD~-N9P%`a;~(#syqY)+%wN5O^>~0EnhTSeQB!dQtjNl<~!Q? z3nrrlUK|{HUFr|lrlMx+kfesEt4&nc6PgqPFOPei!~4uy6+L0e<#A7eTcVAh6@g}C zuz}{{D%B<65Xl9LPCiTVth(qeS5%*W-(!hp=Zo3Zx4dG5rrxQ%&b+vtj2d^&T5={V zKb3x=v|Ut{v(OxDh3|~=rdMEm+Hg_DDr`3ip35#?=obG~&kv1XJgdf}V)gj6GuHVj ztzPf7MAXsa=xdbO(OLR+{zC4Mt^b1wmHxK6+d+x67!=>~LepmNJ5y@Tix_epbI< z@?C!HVuupv!)DcP-}ORE=klleyem_AMWqTOdwr)K1;NQ!dE4#w*;T6*QK2Ht}jT){Ca+jp1|?>l~F*Ffx~%^;(gbO=I@{L{Y?~o$EKQ5c2hU{ zE?5_TEXR4TEpstg%1j*{VXSg!_CoV@yl3~DmQDUBC2Ct1Q{ec8@ovMxdarB6fo&}^ zAfk=R?BIr!R>PE5S9`5DQQ&=3JkQ%*3~XA+tSeQh%am+O00^EV*^ik$FyS>fcH6Uv{4UK8E_PItity>Q9!` zpR5YYtc0>Hk(dlJS)9U(gmO>~%fUp2roT+UG;M1`P5?>H{sRGLtGv{?=ZyQYgx7yJ zuYa|zE%EV(3-nWuB3^V(Dr&prHsg= z80UMXcw4%&C{jmmex8kG(imlAg5SzQ>Iv z^t-zIdVOQY7RQq|)YPA9&h@#pedp`|*OCuxua`P&=Y~{2irRS0uB-el>0rV=z1Zo^ z(tAVxe$rVi*(A3&Xm3T7Tx~!n=Hj>zr+ZVM`_2zGDeBX>^ac^ zQCuEBA_`CH&rxO<;unSTkVWH3;tXcosAxU{8U_ z7mINOhj7Tyg;JUg<`WwL5$w4^K^&A#43d#8#6t%He?#=n((wd0zc{Q9OqI-l3~Z1LjvHVT9=x0bWDz|1 zoG@>6Vduwl;&6jQuwK97l{kIcFgXzB_oJZFD1c(QUvM-Y@~A=PwLW^Lkzu7`Vi?MS zA-Uhsq|h7|Vj@9e`Ck^?f7+iyq2S331_+vnXTmkqI8-wLhTs$?6D#Qc0BlGf1phY$ zC%%Vpi3`F*WstFgt})t)OgvaRJcCZb)0sp(od(xTDt3=TC*f%%3J$fUlWBMsa2M-? zenVRf2ZfHOf!<&^`uT||f|xOMu#^20#r4+%1Ytx%XDX}~gap+TBCT&?@Ef(qeuHA6 zYm893_`saw+i!}hvQOpEPN`MdDV-d-~ z6j;`10I_5S1{!&3{EsI1{~g!j0r!rKx!ANJtBd*jp*bwcL$h9rlQ6>S_~iz`AYrGFU49T98c(#_C!|w^9N1G^=s7(kOn~><6hVPj;O-!=1((u@0Pxs zd7@j;bg4S<(b$wANL99K=Y-jd?*^{E9uR(G*=mjVhmMyYDR`7}r+G1DuT*!jZdb2# zakP2L&u$PDY>*e?nSxpWRjNq}z1)MirbgY)OhPAn^otP?BOfYeazA1g_=R5~cFVL; zt;WkqzO0($?qUDucYeb4?@JH2jXhV*9-XG?ko=Yw>O$;3L)KX4VZ0-Id-Yu6B8B$u z{a3${on3dOwyr!axvsP)a@}?3FYhB0Bo6l`$lO)Bt~+V|2ow(80rXQyWBr;!3XL|8 z=yAMULbb5a5%<_}8_qa&k@bwe9QhJ=6Z?Eaf-7B1O?p&~(<;YvFx4>%40@WSA zSGy>l$c}h0)6vFK;ljA}4=9&f#;vz$PB~yLc&DwL8<*Pd82&Vt*IZRY$zY8hSG#~$ z*qZx((X9@FtdVkaSawf_ZH2R!Mx@uCNY|c2r7f8^*A|>yUe>z#gsyJZi|28-t5^Qh$lC_jV#?fGv?3w+XB|K+}qtnU9PK? z<{ReDeq_As33-N5@tZ~L#O|^Q*E;qW%>5$hy|;PW>q#f??E9;8p26(g%)g4V&RBfU z*wgb(a?@TPEWhlJn|JaE+jKhf*UY1kPkVp>siRa=H4Sl(gJduPo-a;2Yil;nN%7Lv zQDus2$_)g`zb~|<+GHosS1t%L3{rMxN>17?BT-+j@n{4|qP(-i)E!*ruLYS=Ii{K@ zXTP%0S1QRcXwQ_Kveo19v;M_%uUL7;T$Sv3&o6a@)NV!7RL>rn+4(sS$YsKe@xW)K2 zu}y*}(#1*Lf2U?I#o3j6r{`_b%;A3G=*^wB)$Br-b6DE=*B|O}X=+>M8MGHDZuaR!*8wLK0%|9#6;F})2K!4b9 zY}2gIPA1D-+gIc}a~mgZJ-Xc?f)SBudB*yU+11rcn(#KBH>Pk`{ds6tz?3{~&iWO) zd5YA_x*HnREH+S7v)?98Nm}Y+STSX@)z~rnRxh2HpCOQm7!`eOSDaXq*Fj_LZY zzh0Zyk!U?tEy4Hm_nRN%zkQX|J+;Q`XVFlGrbHgFI{(1vyUnf)vj?m5xB8;{63>^# z?^c+z_pR-49-poEQa`V8 zXy*=(asHy-5UDCnK4Fr{RoTD);3!5nf4HBoyxrH3>U$)@*>K!nRg^$s+P+OSHaoqv zR=BB~9@S`~T~J zB>RRufB%h36^-`~KY1U^up_*_f3PAhQSrIUapBW~m8PqX+Wyw~)^+*{XZ>@p3e{AC zl%(h6?%JGVZt0(R+WPw*j>*R_^(}9D6*Q(SnmPjiM%W#YssBK=r_E+!<$cw^r&-J-ez*|^_98hqL;Z^7gt=|_xIJ9@tQ1U4X5i` zUTy~$S4})88><^M`pp5F={oJ_l2!pYMnYtqYu)Xx7;T!=%A3pFgFMJ4<09)XNqffJ zx{_PtUYMcKwWwvxm9r{0I9dmG=G0}R=)397aoYFHu$W?#C6#}8c7CRAZBl20{w}|{ z`k{(n7P;KH8Lif=L!GX9*n(9sbDp4~zE;6RwzsOO+QCcbu!XWJ@4_9sUcrkF#=Yxj z%WB_#ToPScMbwzz^Z4ZWEVq*%8H5KPEgwGr^i}d;!9vXu7&yYFgN)9uzjAvtkA^XJ zB)Q69oaRCG(Q5;Dd!LK>zAWs|>3%BTZRcOfmWwa0Z#M39nPKj#bjs|)iAf42F$OQL z=HYjnyxf;tdg9ux2fjQV!zF7p8NN@snL0GSD7nxq$98S4!K>U=F)N>*ch`;!)sBjl zQn9P|l@G1Zbemspu_uc?>cRJG`?kEfx_kVm@q(^b)62p|Mxn8ju0?5(+sdey zwdB+sCR)Th6!IRF-B|G#RkbZhfxT_iQMOgaSP9=rOMKS6IBL&wxxT4jPej$_4@%Y& zp5;HYhBVY{4m%E$#7WBs!V+Y(lCi|#|4mo|j%FnMG%6hSNDMe{kjQX&`1g?s+_1<5 zI&VYX^8m=x4rgs1CyE;ph)2qvz=?{$6C%PP@__cx1b#>q2d;x4!8&|%V>xifgkS?Y zbKnUa90|^O1TLg92Qh~O4RA{D&nMp(tU%xYEY4xi3H9@i@q~2jxFNxgK_~mha8XV+_SV8AgbRV@xQ3$N2K-2-I z`)>+Pe2)TcQ9(Gwg+?Lu1p(*~-k>u95eq^e3}6VTGz|u4paS6!GK+?T0-+ET+5jZ5 zS{R_=3?>jjglklz`xGb;-C#g}gp44Fu}fYQS_MxOPRt#{UCY*H4~VHYOFwD0WkwH0o7=H zOlXLKz+7M`4vk5JK0ic85RoLL)@URu`awi2f(vYFsD^^c0}a<#a5R`A)>9m0>B9*G z_MsrdjG-G1Q3aHv?nn*9;u6-a$^@9u-~(6?Q4k@* z?)4*J(OGzLL5k3)14s{kEEumrFOW_QDVRPWoe&pHSNe4V>BG>1=)!&j4x}66f@V%9 z(m;klE7E}x3X2IcL3#lJ=AlKb6XF^%1>}yyYIHrMV6yJJkJ=0rq!&o4s2+%YU>-w! zP6@|jfevsWeHI=I2EZ@OhJy?--{OiV_rIZog9mwHFfJZDd%kAUqwVF2VXKq_zp*XKuoZK&0t5gQska0Er@$KnVvtUhW6n+`q3+fcAz zdw?GvoKD~CN(NsvLa?&|FmgOLWN|a18AQZKYKU%NO-bUW{|!bW3fT`*0}giZAUNRA z`hxc8yZ=QX{o8H|YhZZsyHW^V+~x4l0HcWn??Lh7hV%P=;0ZnuUgtsV6-O9+lL>mb zfIXz(U@sQ=M{i3(6YGC+fp!oOBZmLjD@m~TwTOqC-#^^1H)b(grbpEf7428<9zD)F zb!k>e>w%UDTd3X-4R5xX?G?J!X(^SLUXrz#SNw5RQugOlq0xuGH0pg{YO(sk+Pgk2 zgimH}NiNs?k}GiM7g)ZwCQGfqwE2kBp}j}R)3-Dqh_KP~c`)&!x_YvHxC+%~F^AT3 zaqk2hy&Vr|$p%xT7B+8^IQCNR$kklMMS|^i?1u&NHcf#>MOoJu(e+sWnj2L$Q+t0^ z+H^+?wMY4J&2mrnuOi(GwXfNyBm2-xU*|aW&+3!E%kaj;WfAuKQ8RmpcP8nk-kdK{ zxaU$$0@XXE*LAf2I-P|bxM1roQTC;QS!$}( z>fDfs%QKQb;coYwerbkANpAYBqWqJsDqpe#X$B{hTJf1ut)R&UnK-`g$S z{!%_UFI`8(-E+q?#C#epet|i~p!RGvYx)Ff?KS5L_xrx=xvXHTzbCv(*U))9pdwR{FhvHg4SWddWA5_PQf$f8I|H4KO)@CGK0)gX%gYgfa*eZy-Rm z27yEO?0pNS@BKgU4xJcyHUz7~g&T;TWx);)t!4Bm3(^aRjU#JdK+Y=EvtPkKixo`s2xF@Zigg7ZJ^; zQ%r)HbRvly;Ae^t;q!Us1j1lLvxul*KmqF_FeU(AnKKjzFE9x2?-#HPXfqx{V_Xy` z2nVi?h6AV8|A9RL4J>F7egK9-#pr_%?}w4;bcm-6gV7k!>n9la`C%|R+J_8>(TTu+ z^cgw^GO9no;0JwpUm}qL`;g)7$nePLM;M7k0>ASk3`t=)jKpHW9{$I6Bo-Z>y!;3w zlgP+Gqt5`%Bo>(nQvU%4p-p7HhruX6!@w*Kp9egwr2oVh5}5`H{UbgS75wvX7q{c8_oBN U;$x~$rZX87oPmLZyCd$u0G%FuGXMYp From 35c0eb0a18eb583ff7e66f29e96dc9309432cd6f Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Mon, 19 May 2025 23:55:24 -0500 Subject: [PATCH 04/47] DOC: Add petroff6 and petroff8 to 'Named color sequences' example * Add petroff6 and petroff8 as a follow up to PR 30065. --- galleries/examples/color/color_sequences.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/galleries/examples/color/color_sequences.py b/galleries/examples/color/color_sequences.py index 9a2fd04a53d0..4fc5571a0b69 100644 --- a/galleries/examples/color/color_sequences.py +++ b/galleries/examples/color/color_sequences.py @@ -38,7 +38,8 @@ def plot_color_sequences(names, ax): built_in_color_sequences = [ 'tab10', 'tab20', 'tab20b', 'tab20c', 'Pastel1', 'Pastel2', 'Paired', - 'Accent', 'Dark2', 'Set1', 'Set2', 'Set3', 'petroff10'] + 'Accent', 'Dark2', 'Set1', 'Set2', 'Set3', 'petroff6', 'petroff8', + 'petroff10'] fig, ax = plt.subplots(figsize=(6.4, 9.6), layout='constrained') From 11c1a92aeb059733b8286a7595d48f81b15d9193 Mon Sep 17 00:00:00 2001 From: hannah Date: Mon, 19 May 2025 20:33:58 -0400 Subject: [PATCH 05/47] add plot types guidance to docs --- doc/devel/document.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/doc/devel/document.rst b/doc/devel/document.rst index d40d281f8bb9..58beba593fed 100644 --- a/doc/devel/document.rst +++ b/doc/devel/document.rst @@ -1115,6 +1115,28 @@ The current width limit (induced by *pydata-sphinx-theme*) is 720px, i.e. ``figsize=(7.2, ...)``, or 896px if the page does not have subsections and thus does not have the "On this page" navigation on the right-hand side. + +Plot types guidelines +--------------------- + +The :ref:`plot_types` gallery provides an overview of the types of visualizations that +Matplotlib provides out of the box, meaning that there is a high-level API for +generating each type of chart. Additions to this gallery are generally discouraged +because this gallery is heavily curated and tightly scoped to methods on +`matplotlib.axes.Axes`. + +Format +^^^^^^ +:title: Method signature with required arguments, e.g. ``plot(x, y)`` +:description: In one sentence, describe the visualization that the method produces and + link to the API documentation, e.g. *Draws a bar chart. See ~Axes.bar*. + When necessary, add an additional sentence explaining the use case for + this function vs a very similar one, e.g. stairs vs step. +:plot: Use data with a self explanatory structure to illustrate the type of data this + plotting method is typically used for. +:code: The code should be about 5-10 lines with minimal customization. Plots in + this gallery use the ``_mpl-gallery`` stylesheet for a uniform aesthetic. + Miscellaneous ============= From c4e54cfc303c203e4acac728c17cedbea22fd2ef Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Tue, 20 May 2025 11:51:03 +0200 Subject: [PATCH 06/47] Parse FontBBox in type1font. ... instead of having to go through ft2font in createType1Descriptor just to extract the font bbox, ascender and descender. FontBBox is gauranteed to exist in the type1 font definition by the standard; its parsing as a size-4 array matches freetype's behavior (see ps_parser_load_field); and using bbox entries as ascender and descender also matches freetype's behavior (T1_Face_Init directly assigns `root->ascender = (FT_Short)(root->bbox.yMax)` and likewise for the descender; see also the docs for ascender and descender in FT_FaceRec). --- .../next_api_changes/deprecations/30088-AL.rst | 4 ++++ lib/matplotlib/_type1font.py | 10 ++++++++++ lib/matplotlib/backends/backend_pdf.py | 15 +++++++-------- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 doc/api/next_api_changes/deprecations/30088-AL.rst diff --git a/doc/api/next_api_changes/deprecations/30088-AL.rst b/doc/api/next_api_changes/deprecations/30088-AL.rst new file mode 100644 index 000000000000..ae1338da7f85 --- /dev/null +++ b/doc/api/next_api_changes/deprecations/30088-AL.rst @@ -0,0 +1,4 @@ +*fontfile* parameter of ``PdfFile.createType1Descriptor`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +This parameter is deprecated; all relevant pieces of information are now +directly extracted from the *t1font* argument. diff --git a/lib/matplotlib/_type1font.py b/lib/matplotlib/_type1font.py index b3e08f52c035..032b6a42ea63 100644 --- a/lib/matplotlib/_type1font.py +++ b/lib/matplotlib/_type1font.py @@ -579,6 +579,16 @@ def _parse(self): extras = ('(?i)([ -](regular|plain|italic|oblique|(semi)?bold|' '(ultra)?light|extra|condensed))+$') prop['FamilyName'] = re.sub(extras, '', prop['FullName']) + + # Parse FontBBox + toks = [*_tokenize(prop['FontBBox'].encode('ascii'), True)] + if ([tok.kind for tok in toks] + != ['delimiter', 'number', 'number', 'number', 'number', 'delimiter'] + or toks[-1].raw != toks[0].opposite()): + raise RuntimeError( + f"FontBBox should be a size-4 array, was {prop['FontBBox']}") + prop['FontBBox'] = [tok.value() for tok in toks[1:-1]] + # Decrypt the encrypted parts ndiscard = prop.get('lenIV', 4) cs = prop['CharStrings'] diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 73cf8bc19be2..073ca05bc172 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -1034,14 +1034,15 @@ def _embedTeXFont(self, fontinfo): fontinfo.effects.get('extend', 1.0)) fontdesc = self._type1Descriptors.get((fontinfo.fontfile, effects)) if fontdesc is None: - fontdesc = self.createType1Descriptor(t1font, fontinfo.fontfile) + fontdesc = self.createType1Descriptor(t1font) self._type1Descriptors[(fontinfo.fontfile, effects)] = fontdesc fontdict['FontDescriptor'] = fontdesc self.writeObject(fontdictObject, fontdict) return fontdictObject - def createType1Descriptor(self, t1font, fontfile): + @_api.delete_parameter("3.11", "fontfile") + def createType1Descriptor(self, t1font, fontfile=None): # Create and write the font descriptor and the font file # of a Type-1 font fontdescObject = self.reserveObject('font descriptor') @@ -1076,16 +1077,14 @@ def createType1Descriptor(self, t1font, fontfile): if 0: flags |= 1 << 18 - ft2font = get_font(fontfile) - descriptor = { 'Type': Name('FontDescriptor'), 'FontName': Name(t1font.prop['FontName']), 'Flags': flags, - 'FontBBox': ft2font.bbox, + 'FontBBox': t1font.prop['FontBBox'], 'ItalicAngle': italic_angle, - 'Ascent': ft2font.ascender, - 'Descent': ft2font.descender, + 'Ascent': t1font.prop['FontBBox'][3], + 'Descent': t1font.prop['FontBBox'][1], 'CapHeight': 1000, # TODO: find this out 'XHeight': 500, # TODO: this one too 'FontFile': fontfileObject, @@ -1093,7 +1092,7 @@ def createType1Descriptor(self, t1font, fontfile): 'StemV': 50, # TODO # (see also revision 3874; but not all TeX distros have AFM files!) # 'FontWeight': a number where 400 = Regular, 700 = Bold - } + } self.writeObject(fontdescObject, descriptor) From d77efae515271c2792c5135817b980d495b3034f Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Tue, 20 May 2025 10:09:17 -0700 Subject: [PATCH 07/47] FIX: fix submerged margins algorithm being applied twice --- lib/matplotlib/_constrained_layout.py | 8 ++++++-- .../tests/test_constrainedlayout.py | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py index 5623e12a3c41..f5f23581bd9d 100644 --- a/lib/matplotlib/_constrained_layout.py +++ b/lib/matplotlib/_constrained_layout.py @@ -521,11 +521,13 @@ def match_submerged_margins(layoutgrids, fig): See test_constrained_layout::test_constrained_layout12 for an example. """ + axsdone = [] for sfig in fig.subfigs: - match_submerged_margins(layoutgrids, sfig) + axsdone += match_submerged_margins(layoutgrids, sfig) axs = [a for a in fig.get_axes() - if a.get_subplotspec() is not None and a.get_in_layout()] + if (a.get_subplotspec() is not None and a.get_in_layout() and + a not in axsdone)] for ax1 in axs: ss1 = ax1.get_subplotspec() @@ -592,6 +594,8 @@ def match_submerged_margins(layoutgrids, fig): for i in ss1.rowspan[:-1]: lg1.edit_margin_min('bottom', maxsubb, cell=i) + return axs + def get_cb_parent_spans(cbax): """ diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py index 7c7dd43a3115..df2dbd6f43bd 100644 --- a/lib/matplotlib/tests/test_constrainedlayout.py +++ b/lib/matplotlib/tests/test_constrainedlayout.py @@ -721,3 +721,23 @@ def test_layout_leak(): gc.collect() assert not any(isinstance(obj, mpl._layoutgrid.LayoutGrid) for obj in gc.get_objects()) + + +def test_submerged_subfig(): + """ + Test that the submerged margin logic does not get called multiple times + on same axes if it is already in a subfigure + """ + fig = plt.figure(figsize=(4, 5), layout='constrained') + figures = fig.subfigures(3, 1) + axs = [] + for f in figures.flatten(): + gs = f.add_gridspec(2, 2) + for i in range(2): + axs += [f.add_subplot(gs[i, 0])] + axs[-1].plot() + f.add_subplot(gs[:, 1]).plot() + fig.draw_without_rendering() + for ax in axs[1:]: + assert np.allclose(ax.get_position().bounds[-1], + axs[0].get_position().bounds[-1], atol=1e-6) From a3782cd84ecaca23b883ff0083c982108782862c Mon Sep 17 00:00:00 2001 From: hannah Date: Mon, 19 May 2025 21:22:21 -0400 Subject: [PATCH 08/47] add API docs content guidelines to api docs instructions Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- doc/devel/document.rst | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/devel/document.rst b/doc/devel/document.rst index d40d281f8bb9..819c3a4bf818 100644 --- a/doc/devel/document.rst +++ b/doc/devel/document.rst @@ -399,11 +399,14 @@ expression in the Matplotlib figure. In these cases, you can use the .. _writing-docstrings: -Write docstrings -================ +Write API documentation +======================= -Most of the API documentation is written in docstrings. These are comment -blocks in source code that explain how the code works. +The API reference documentation describes the library interfaces, e.g. inputs, outputs, +and expected behavior. Most of the API documentation is written in docstrings. These are +comment blocks in source code that explain how the code works. All docstrings should +conform to the `numpydoc docstring guide`_. Much of the ReST_ syntax discussed above +(:ref:`writing-rest-pages`) can be used for links and references. .. note:: @@ -412,11 +415,11 @@ blocks in source code that explain how the code works. you may see in the source code. Pull requests updating docstrings to the current style are very welcome. -All new or edited docstrings should conform to the `numpydoc docstring guide`_. -Much of the ReST_ syntax discussed above (:ref:`writing-rest-pages`) can be -used for links and references. These docstrings eventually populate the -:file:`doc/api` directory and form the reference documentation for the -library. +The pages in :file:`doc/api` are purely technical definitions of +layout; therefore new API reference documentation should be added to the module +docstrings. This placement keeps all API reference documentation about a module in the +same file. These module docstrings eventually populate the :file:`doc/api` directory +and form the reference documentation for the library. Example docstring ----------------- From c3987ee06745d15f0a35d33de7f40101c13e39fc Mon Sep 17 00:00:00 2001 From: hannah Date: Mon, 19 May 2025 21:26:04 -0400 Subject: [PATCH 09/47] move inheritance diagrams out of miscellanious to API --- doc/devel/document.rst | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/doc/devel/document.rst b/doc/devel/document.rst index 819c3a4bf818..1c057bb8547b 100644 --- a/doc/devel/document.rst +++ b/doc/devel/document.rst @@ -869,6 +869,26 @@ Plots can also be directly placed inside docstrings. Details are in An advantage of this style over referencing an example script is that the code will also appear in interactive docstrings. +.. _inheritance-diagrams: + +Generate inheritance diagrams +----------------------------- + +Class inheritance diagrams can be generated with the Sphinx +`inheritance-diagram`_ directive. + +.. _inheritance-diagram: https://www.sphinx-doc.org/en/master/usage/extensions/inheritance.html + +Example: + +.. code-block:: rst + + .. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text + :parts: 2 + +.. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text + :parts: 2 + .. _writing-examples-and-tutorials: Write examples and tutorials @@ -1154,28 +1174,6 @@ Use the full path for this directive, relative to the doc root at found by users at ``http://matplotlib.org/stable/old_topic/old_info2``. For clarity, do not use relative links. - -.. _inheritance-diagrams: - -Generate inheritance diagrams ------------------------------ - -Class inheritance diagrams can be generated with the Sphinx -`inheritance-diagram`_ directive. - -.. _inheritance-diagram: https://www.sphinx-doc.org/en/master/usage/extensions/inheritance.html - -Example: - -.. code-block:: rst - - .. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text - :parts: 2 - -.. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text - :parts: 2 - - Navbar and style ---------------- From 9e7106b3a843b9268fab227ed20103037f57ff6f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 17 May 2025 05:14:49 -0400 Subject: [PATCH 10/47] Move test data into a single subdirectory Consolidating these files make it easier to remove or restore them without having to track each one individually. --- .pre-commit-config.yaml | 2 +- .../{ => data}/Courier10PitchBT-Bold.pfb | Bin lib/matplotlib/tests/{ => data}/cmr10.pfb | Bin lib/matplotlib/tests/{ => data}/mpltest.ttf | Bin .../tests/{ => data}/test_inline_01.ipynb | 0 .../tests/{ => data}/test_nbagg_01.ipynb | 0 .../tests/{ => data}/tinypages/.gitignore | 0 .../tests/{ => data}/tinypages/README.md | 0 .../{ => data}/tinypages/_static/.gitignore | 0 .../{ => data}/tinypages/_static/README.txt | 0 .../tests/{ => data}/tinypages/conf.py | 0 .../{ => data}/tinypages/included_plot_21.rst | 0 .../tests/{ => data}/tinypages/index.rst | 0 .../{ => data}/tinypages/nestedpage/index.rst | 0 .../tinypages/nestedpage2/index.rst | 0 .../tests/{ => data}/tinypages/range4.py | 0 .../tests/{ => data}/tinypages/range6.py | 0 .../tests/{ => data}/tinypages/some_plots.rst | 0 lib/matplotlib/tests/meson.build | 9 ++---- lib/matplotlib/tests/test_backend_inline.py | 2 +- lib/matplotlib/tests/test_backend_nbagg.py | 2 +- lib/matplotlib/tests/test_backend_pdf.py | 2 +- lib/matplotlib/tests/test_font_manager.py | 6 ++-- lib/matplotlib/tests/test_mathtext.py | 2 +- lib/matplotlib/tests/test_sphinxext.py | 27 ++++++++---------- lib/matplotlib/tests/test_type1font.py | 6 ++-- 26 files changed, 25 insertions(+), 33 deletions(-) rename lib/matplotlib/tests/{ => data}/Courier10PitchBT-Bold.pfb (100%) rename lib/matplotlib/tests/{ => data}/cmr10.pfb (100%) rename lib/matplotlib/tests/{ => data}/mpltest.ttf (100%) rename lib/matplotlib/tests/{ => data}/test_inline_01.ipynb (100%) rename lib/matplotlib/tests/{ => data}/test_nbagg_01.ipynb (100%) rename lib/matplotlib/tests/{ => data}/tinypages/.gitignore (100%) rename lib/matplotlib/tests/{ => data}/tinypages/README.md (100%) rename lib/matplotlib/tests/{ => data}/tinypages/_static/.gitignore (100%) rename lib/matplotlib/tests/{ => data}/tinypages/_static/README.txt (100%) rename lib/matplotlib/tests/{ => data}/tinypages/conf.py (100%) rename lib/matplotlib/tests/{ => data}/tinypages/included_plot_21.rst (100%) rename lib/matplotlib/tests/{ => data}/tinypages/index.rst (100%) rename lib/matplotlib/tests/{ => data}/tinypages/nestedpage/index.rst (100%) rename lib/matplotlib/tests/{ => data}/tinypages/nestedpage2/index.rst (100%) rename lib/matplotlib/tests/{ => data}/tinypages/range4.py (100%) rename lib/matplotlib/tests/{ => data}/tinypages/range6.py (100%) rename lib/matplotlib/tests/{ => data}/tinypages/some_plots.rst (100%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index afcdc44c1b4a..86a9a0f45440 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ exclude: | doc/devel/gitwash| doc/users/prev| doc/api/prev| - lib/matplotlib/tests/tinypages + lib/matplotlib/tests/data/tinypages ) repos: - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/lib/matplotlib/tests/Courier10PitchBT-Bold.pfb b/lib/matplotlib/tests/data/Courier10PitchBT-Bold.pfb similarity index 100% rename from lib/matplotlib/tests/Courier10PitchBT-Bold.pfb rename to lib/matplotlib/tests/data/Courier10PitchBT-Bold.pfb diff --git a/lib/matplotlib/tests/cmr10.pfb b/lib/matplotlib/tests/data/cmr10.pfb similarity index 100% rename from lib/matplotlib/tests/cmr10.pfb rename to lib/matplotlib/tests/data/cmr10.pfb diff --git a/lib/matplotlib/tests/mpltest.ttf b/lib/matplotlib/tests/data/mpltest.ttf similarity index 100% rename from lib/matplotlib/tests/mpltest.ttf rename to lib/matplotlib/tests/data/mpltest.ttf diff --git a/lib/matplotlib/tests/test_inline_01.ipynb b/lib/matplotlib/tests/data/test_inline_01.ipynb similarity index 100% rename from lib/matplotlib/tests/test_inline_01.ipynb rename to lib/matplotlib/tests/data/test_inline_01.ipynb diff --git a/lib/matplotlib/tests/test_nbagg_01.ipynb b/lib/matplotlib/tests/data/test_nbagg_01.ipynb similarity index 100% rename from lib/matplotlib/tests/test_nbagg_01.ipynb rename to lib/matplotlib/tests/data/test_nbagg_01.ipynb diff --git a/lib/matplotlib/tests/tinypages/.gitignore b/lib/matplotlib/tests/data/tinypages/.gitignore similarity index 100% rename from lib/matplotlib/tests/tinypages/.gitignore rename to lib/matplotlib/tests/data/tinypages/.gitignore diff --git a/lib/matplotlib/tests/tinypages/README.md b/lib/matplotlib/tests/data/tinypages/README.md similarity index 100% rename from lib/matplotlib/tests/tinypages/README.md rename to lib/matplotlib/tests/data/tinypages/README.md diff --git a/lib/matplotlib/tests/tinypages/_static/.gitignore b/lib/matplotlib/tests/data/tinypages/_static/.gitignore similarity index 100% rename from lib/matplotlib/tests/tinypages/_static/.gitignore rename to lib/matplotlib/tests/data/tinypages/_static/.gitignore diff --git a/lib/matplotlib/tests/tinypages/_static/README.txt b/lib/matplotlib/tests/data/tinypages/_static/README.txt similarity index 100% rename from lib/matplotlib/tests/tinypages/_static/README.txt rename to lib/matplotlib/tests/data/tinypages/_static/README.txt diff --git a/lib/matplotlib/tests/tinypages/conf.py b/lib/matplotlib/tests/data/tinypages/conf.py similarity index 100% rename from lib/matplotlib/tests/tinypages/conf.py rename to lib/matplotlib/tests/data/tinypages/conf.py diff --git a/lib/matplotlib/tests/tinypages/included_plot_21.rst b/lib/matplotlib/tests/data/tinypages/included_plot_21.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/included_plot_21.rst rename to lib/matplotlib/tests/data/tinypages/included_plot_21.rst diff --git a/lib/matplotlib/tests/tinypages/index.rst b/lib/matplotlib/tests/data/tinypages/index.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/index.rst rename to lib/matplotlib/tests/data/tinypages/index.rst diff --git a/lib/matplotlib/tests/tinypages/nestedpage/index.rst b/lib/matplotlib/tests/data/tinypages/nestedpage/index.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/nestedpage/index.rst rename to lib/matplotlib/tests/data/tinypages/nestedpage/index.rst diff --git a/lib/matplotlib/tests/tinypages/nestedpage2/index.rst b/lib/matplotlib/tests/data/tinypages/nestedpage2/index.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/nestedpage2/index.rst rename to lib/matplotlib/tests/data/tinypages/nestedpage2/index.rst diff --git a/lib/matplotlib/tests/tinypages/range4.py b/lib/matplotlib/tests/data/tinypages/range4.py similarity index 100% rename from lib/matplotlib/tests/tinypages/range4.py rename to lib/matplotlib/tests/data/tinypages/range4.py diff --git a/lib/matplotlib/tests/tinypages/range6.py b/lib/matplotlib/tests/data/tinypages/range6.py similarity index 100% rename from lib/matplotlib/tests/tinypages/range6.py rename to lib/matplotlib/tests/data/tinypages/range6.py diff --git a/lib/matplotlib/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/data/tinypages/some_plots.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/some_plots.rst rename to lib/matplotlib/tests/data/tinypages/some_plots.rst diff --git a/lib/matplotlib/tests/meson.build b/lib/matplotlib/tests/meson.build index 05336496969f..48b97a1d4b3d 100644 --- a/lib/matplotlib/tests/meson.build +++ b/lib/matplotlib/tests/meson.build @@ -99,11 +99,6 @@ py3.install_sources(python_sources, install_data( 'README', - 'Courier10PitchBT-Bold.pfb', - 'cmr10.pfb', - 'mpltest.ttf', - 'test_nbagg_01.ipynb', - 'test_inline_01.ipynb', install_tag: 'tests', install_dir: py3.get_install_dir(subdir: 'matplotlib/tests/')) @@ -112,6 +107,6 @@ install_subdir( install_tag: 'tests', install_dir: py3.get_install_dir(subdir: 'matplotlib/tests')) install_subdir( - 'tinypages', + 'data', install_tag: 'tests', - install_dir: py3.get_install_dir(subdir: 'matplotlib/tests')) + install_dir: py3.get_install_dir(subdir: 'matplotlib/tests/')) diff --git a/lib/matplotlib/tests/test_backend_inline.py b/lib/matplotlib/tests/test_backend_inline.py index 6f0d67d51756..997e1e7186b1 100644 --- a/lib/matplotlib/tests/test_backend_inline.py +++ b/lib/matplotlib/tests/test_backend_inline.py @@ -13,7 +13,7 @@ def test_ipynb(): - nb_path = Path(__file__).parent / 'test_inline_01.ipynb' + nb_path = Path(__file__).parent / 'data/test_inline_01.ipynb' with TemporaryDirectory() as tmpdir: out_path = Path(tmpdir, "out.ipynb") diff --git a/lib/matplotlib/tests/test_backend_nbagg.py b/lib/matplotlib/tests/test_backend_nbagg.py index 23af88d95086..ccf74df20aab 100644 --- a/lib/matplotlib/tests/test_backend_nbagg.py +++ b/lib/matplotlib/tests/test_backend_nbagg.py @@ -14,7 +14,7 @@ def test_ipynb(): - nb_path = Path(__file__).parent / 'test_nbagg_01.ipynb' + nb_path = Path(__file__).parent / 'data/test_nbagg_01.ipynb' with TemporaryDirectory() as tmpdir: out_path = Path(tmpdir, "out.ipynb") diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py index 60169a38c972..dc349e8dfa35 100644 --- a/lib/matplotlib/tests/test_backend_pdf.py +++ b/lib/matplotlib/tests/test_backend_pdf.py @@ -425,6 +425,6 @@ def test_truetype_conversion(recwarn): mpl.rcParams['pdf.fonttype'] = 3 fig, ax = plt.subplots() ax.text(0, 0, "ABCDE", - font=Path(__file__).with_name("mpltest.ttf"), fontsize=80) + font=Path(__file__).parent / "data/mpltest.ttf", fontsize=80) ax.set_xticks([]) ax.set_yticks([]) diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py index d15b892b3eea..97ee8672b1d4 100644 --- a/lib/matplotlib/tests/test_font_manager.py +++ b/lib/matplotlib/tests/test_font_manager.py @@ -164,7 +164,7 @@ def test_user_fonts_linux(tmpdir, monkeypatch): # Prepare a temporary user font directory user_fonts_dir = tmpdir.join('fonts') user_fonts_dir.ensure(dir=True) - shutil.copyfile(Path(__file__).parent / font_test_file, + shutil.copyfile(Path(__file__).parent / 'data' / font_test_file, user_fonts_dir.join(font_test_file)) with monkeypatch.context() as m: @@ -181,7 +181,7 @@ def test_user_fonts_linux(tmpdir, monkeypatch): def test_addfont_as_path(): """Smoke test that addfont() accepts pathlib.Path.""" font_test_file = 'mpltest.ttf' - path = Path(__file__).parent / font_test_file + path = Path(__file__).parent / 'data' / font_test_file try: fontManager.addfont(path) added, = (font for font in fontManager.ttflist @@ -215,7 +215,7 @@ def test_user_fonts_win32(): os.makedirs(user_fonts_dir) # Copy the test font to the user font directory - shutil.copy(Path(__file__).parent / font_test_file, user_fonts_dir) + shutil.copy(Path(__file__).parent / 'data' / font_test_file, user_fonts_dir) # Now, the font should be available fonts = findSystemFonts() diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index 198e640ad286..39c28dc9228c 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -437,7 +437,7 @@ def test_mathtext_fallback_invalid(): ("stix", ['DejaVu Sans', 'mpltest', 'STIXGeneral', 'STIXGeneral', 'STIXGeneral'])]) def test_mathtext_fallback(fallback, fontlist): mpl.font_manager.fontManager.addfont( - str(Path(__file__).resolve().parent / 'mpltest.ttf')) + (Path(__file__).resolve().parent / 'data/mpltest.ttf')) mpl.rcParams["svg.fonttype"] = 'none' mpl.rcParams['mathtext.fontset'] = 'custom' mpl.rcParams['mathtext.rm'] = 'mpltest' diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 1aaa6baca47c..6e42378bdf6b 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -13,6 +13,9 @@ pytest.importorskip('sphinx', minversion='4.1.3') +tinypages = Path(__file__).parent / 'data/tinypages' + + def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): # Build the pages with warnings turned into errors extra_args = [] if extra_args is None else extra_args @@ -33,15 +36,13 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): def test_tinypages(tmp_path): - shutil.copytree(Path(__file__).parent / 'tinypages', tmp_path, - dirs_exist_ok=True) + shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' # Build the pages with warnings turned into errors cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', - '-d', str(doctree_dir), - str(Path(__file__).parent / 'tinypages'), str(html_dir)] + '-d', str(doctree_dir), str(tinypages), str(html_dir)] # On CI, gcov emits warnings (due to agg headers being included with the # same name in multiple extension modules -- but we don't care about their # coverage anyways); hide them using GCOV_ERROR_FILE. @@ -125,9 +126,8 @@ def plot_directive_file(num): def test_plot_html_show_source_link(tmp_path): - parent = Path(__file__).parent - shutil.copyfile(parent / 'tinypages/conf.py', tmp_path / 'conf.py') - shutil.copytree(parent / 'tinypages/_static', tmp_path / '_static') + shutil.copyfile(tinypages / 'conf.py', tmp_path / 'conf.py') + shutil.copytree(tinypages / '_static', tmp_path / '_static') doctree_dir = tmp_path / 'doctrees' (tmp_path / 'index.rst').write_text(""" .. plot:: @@ -150,9 +150,8 @@ def test_plot_html_show_source_link(tmp_path): def test_show_source_link_true(tmp_path, plot_html_show_source_link): # Test that a source link is generated if :show-source-link: is true, # whether or not plot_html_show_source_link is true. - parent = Path(__file__).parent - shutil.copyfile(parent / 'tinypages/conf.py', tmp_path / 'conf.py') - shutil.copytree(parent / 'tinypages/_static', tmp_path / '_static') + shutil.copyfile(tinypages / 'conf.py', tmp_path / 'conf.py') + shutil.copytree(tinypages / '_static', tmp_path / '_static') doctree_dir = tmp_path / 'doctrees' (tmp_path / 'index.rst').write_text(""" .. plot:: @@ -170,9 +169,8 @@ def test_show_source_link_true(tmp_path, plot_html_show_source_link): def test_show_source_link_false(tmp_path, plot_html_show_source_link): # Test that a source link is NOT generated if :show-source-link: is false, # whether or not plot_html_show_source_link is true. - parent = Path(__file__).parent - shutil.copyfile(parent / 'tinypages/conf.py', tmp_path / 'conf.py') - shutil.copytree(parent / 'tinypages/_static', tmp_path / '_static') + shutil.copyfile(tinypages / 'conf.py', tmp_path / 'conf.py') + shutil.copytree(tinypages / '_static', tmp_path / '_static') doctree_dir = tmp_path / 'doctrees' (tmp_path / 'index.rst').write_text(""" .. plot:: @@ -187,8 +185,7 @@ def test_show_source_link_false(tmp_path, plot_html_show_source_link): def test_srcset_version(tmp_path): - shutil.copytree(Path(__file__).parent / 'tinypages', tmp_path, - dirs_exist_ok=True) + shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' diff --git a/lib/matplotlib/tests/test_type1font.py b/lib/matplotlib/tests/test_type1font.py index 9b8a2d1f07c6..b2f93ef28a26 100644 --- a/lib/matplotlib/tests/test_type1font.py +++ b/lib/matplotlib/tests/test_type1font.py @@ -5,7 +5,7 @@ def test_Type1Font(): - filename = os.path.join(os.path.dirname(__file__), 'cmr10.pfb') + filename = os.path.join(os.path.dirname(__file__), 'data', 'cmr10.pfb') font = t1f.Type1Font(filename) slanted = font.transform({'slant': 1}) condensed = font.transform({'extend': 0.5}) @@ -78,7 +78,7 @@ def test_Type1Font(): def test_Type1Font_2(): - filename = os.path.join(os.path.dirname(__file__), + filename = os.path.join(os.path.dirname(__file__), 'data', 'Courier10PitchBT-Bold.pfb') font = t1f.Type1Font(filename) assert font.prop['Weight'] == 'Bold' @@ -137,7 +137,7 @@ def test_tokenize_errors(): def test_overprecision(): # We used to output too many digits in FontMatrix entries and # ItalicAngle, which could make Type-1 parsers unhappy. - filename = os.path.join(os.path.dirname(__file__), 'cmr10.pfb') + filename = os.path.join(os.path.dirname(__file__), 'data', 'cmr10.pfb') font = t1f.Type1Font(filename) slanted = font.transform({'slant': .167}) lines = slanted.parts[0].decode('ascii').splitlines() From a7c08c82568234ebe850abb8d8de402ec8c82fd6 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 21 May 2025 07:16:46 -0400 Subject: [PATCH 11/47] Simplify some Sphinx tests (#30090) - `test_tinypages` unnecessarily calls `sphinx-build` twice. - `test_srcset_versions` doesn't need an extra copy of the source files, as it doesn't modify anything. --- lib/matplotlib/tests/test_sphinxext.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 6e42378bdf6b..6a81f56fe924 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -21,9 +21,13 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): extra_args = [] if extra_args is None else extra_args cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', '-d', str(doctree_dir), str(source_dir), str(html_dir), *extra_args] + # On CI, gcov emits warnings (due to agg headers being included with the + # same name in multiple extension modules -- but we don't care about their + # coverage anyways); hide them using GCOV_ERROR_FILE. proc = subprocess_run_for_testing( cmd, capture_output=True, text=True, - env={**os.environ, "MPLBACKEND": ""}) + env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull} + ) out = proc.stdout err = proc.stderr @@ -40,18 +44,6 @@ def test_tinypages(tmp_path): html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' - # Build the pages with warnings turned into errors - cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', - '-d', str(doctree_dir), str(tinypages), str(html_dir)] - # On CI, gcov emits warnings (due to agg headers being included with the - # same name in multiple extension modules -- but we don't care about their - # coverage anyways); hide them using GCOV_ERROR_FILE. - proc = subprocess_run_for_testing( - cmd, capture_output=True, text=True, - env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull} - ) - out = proc.stdout - err = proc.stderr # Build the pages with warnings turned into errors build_sphinx_html(tmp_path, doctree_dir, html_dir) @@ -185,13 +177,12 @@ def test_show_source_link_false(tmp_path, plot_html_show_source_link): def test_srcset_version(tmp_path): - shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' - build_sphinx_html(tmp_path, doctree_dir, html_dir, extra_args=[ - '-D', 'plot_srcset=2x']) + build_sphinx_html(tinypages, doctree_dir, html_dir, + extra_args=['-D', 'plot_srcset=2x']) def plot_file(num, suff=''): return img_dir / f'some_plots-{num}{suff}.png' From bb5bfb88b641e8266bf442ea498d05df3f8bcdc6 Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 23 May 2025 10:38:54 +0200 Subject: [PATCH 12/47] remove point troubling regex --- galleries/plot_types/basic/scatter_plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galleries/plot_types/basic/scatter_plot.py b/galleries/plot_types/basic/scatter_plot.py index 07fa943b724f..738af15440db 100644 --- a/galleries/plot_types/basic/scatter_plot.py +++ b/galleries/plot_types/basic/scatter_plot.py @@ -2,7 +2,7 @@ ============= scatter(x, y) ============= -A scatter plot of y vs. x with varying marker size and/or color. +A scatter plot of y versus x with varying marker size and/or color. See `~matplotlib.axes.Axes.scatter`. """ From 731f45460b5fd50b1490f028701400e2b460388d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 22 May 2025 04:04:16 -0400 Subject: [PATCH 13/47] Fix OffsetBox custom picker As with the custom picker, `Artist.contains` returns a boolean and a dictionary in a tuple. This non-empty tuple is always true, so the custom picker would always return True for any non-scroll event. It would also lose the related dictionary. --- lib/matplotlib/offsetbox.py | 4 +++- lib/matplotlib/tests/test_offsetbox.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py index 6a3a122fc3e7..1e07125cdc2a 100644 --- a/lib/matplotlib/offsetbox.py +++ b/lib/matplotlib/offsetbox.py @@ -1504,7 +1504,9 @@ def __init__(self, ref_artist, use_blit=False): @staticmethod def _picker(artist, mouseevent): # A custom picker to prevent dragging on mouse scroll events - return (artist.contains(mouseevent) and mouseevent.name != "scroll_event"), {} + if mouseevent.name == "scroll_event": + return False, {} + return artist.contains(mouseevent) # A property, not an attribute, to maintain picklability. canvas = property(lambda self: self.ref_artist.get_figure(root=True).canvas) diff --git a/lib/matplotlib/tests/test_offsetbox.py b/lib/matplotlib/tests/test_offsetbox.py index f18fa7c777d1..d9791ff5bc20 100644 --- a/lib/matplotlib/tests/test_offsetbox.py +++ b/lib/matplotlib/tests/test_offsetbox.py @@ -460,3 +460,13 @@ def test_draggable_in_subfigure(): fig.canvas.draw() # Texts are non-pickable until the first draw. MouseEvent("button_press_event", fig.canvas, 1, 1)._process() assert ann._draggable.got_artist + # Stop dragging the annotation. + MouseEvent("button_release_event", fig.canvas, 1, 1)._process() + assert not ann._draggable.got_artist + # A scroll event should not initiate a drag. + MouseEvent("scroll_event", fig.canvas, 1, 1)._process() + assert not ann._draggable.got_artist + # An event outside the annotation should not initiate a drag. + bbox = ann.get_window_extent() + MouseEvent("button_press_event", fig.canvas, bbox.x1+2, bbox.y1+2)._process() + assert not ann._draggable.got_artist From 0b2c33e8ecd432767833886307b83a6ffe2a472e Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 23 May 2025 12:49:10 +0200 Subject: [PATCH 14/47] Fix tight-bbox computation of HostAxes. --- lib/mpl_toolkits/axes_grid1/parasite_axes.py | 3 +++ .../axes_grid1/tests/test_axes_grid1.py | 23 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/mpl_toolkits/axes_grid1/parasite_axes.py b/lib/mpl_toolkits/axes_grid1/parasite_axes.py index f7bc2df6d7e0..fbc6e8141272 100644 --- a/lib/mpl_toolkits/axes_grid1/parasite_axes.py +++ b/lib/mpl_toolkits/axes_grid1/parasite_axes.py @@ -25,6 +25,9 @@ def clear(self): self._parent_axes.callbacks._connect_picklable( "ylim_changed", self._sync_lims) + def get_axes_locator(self): + return self._parent_axes.get_axes_locator() + def pick(self, mouseevent): # This most likely goes to Artist.pick (depending on axes_class given # to the factory), which only handles pick events registered on the diff --git a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py index 496ce74d72c0..26f0aaa37de0 100644 --- a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py @@ -9,7 +9,7 @@ from matplotlib.backend_bases import MouseEvent from matplotlib.colors import LogNorm from matplotlib.patches import Circle, Ellipse -from matplotlib.transforms import Bbox, TransformedBbox +from matplotlib.transforms import Affine2D, Bbox, TransformedBbox from matplotlib.testing.decorators import ( check_figures_equal, image_comparison, remove_ticks_and_titles) @@ -26,6 +26,7 @@ from mpl_toolkits.axes_grid1.axes_rgb import RGBAxes from mpl_toolkits.axes_grid1.inset_locator import ( zoomed_inset_axes, mark_inset, inset_axes, BboxConnectorPatch) +from mpl_toolkits.axes_grid1.parasite_axes import HostAxes import mpl_toolkits.axes_grid1.mpl_axes import pytest @@ -467,6 +468,26 @@ def test_gettightbbox(): [-17.7, -13.9, 7.2, 5.4]) +def test_gettightbbox_parasite(): + fig = plt.figure() + + y0 = 0.3 + horiz = [Size.Scaled(1.0)] + vert = [Size.Scaled(1.0)] + ax0_div = Divider(fig, [0.1, y0, 0.8, 0.2], horiz, vert) + ax1_div = Divider(fig, [0.1, 0.5, 0.8, 0.4], horiz, vert) + + ax0 = fig.add_subplot( + xticks=[], yticks=[], axes_locator=ax0_div.new_locator(nx=0, ny=0)) + ax1 = fig.add_subplot( + axes_class=HostAxes, axes_locator=ax1_div.new_locator(nx=0, ny=0)) + aux_ax = ax1.get_aux_axes(Affine2D()) + + fig.canvas.draw() + rdr = fig.canvas.get_renderer() + assert rdr.get_canvas_width_height()[1] * y0 / fig.dpi == fig.get_tightbbox(rdr).y0 + + @pytest.mark.parametrize("click_on", ["big", "small"]) @pytest.mark.parametrize("big_on_axes,small_on_axes", [ ("gca", "gca"), From 04d26b243c1f11b1a8fb433a0c9ef8a71728e507 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sat, 24 May 2025 12:46:24 +0200 Subject: [PATCH 15/47] Simplify/improve error reporting from ft2font. Provide a simple macro to call a FreeType function and throw an exception if an error is returned, while also including the source file and line location for the error. For example, trying `FT2Font(open("pyproject.toml", "rb"))` now raises "FT_Open_Face (ft2font.cpp line 220) failed with error 0x2: unknown file format" instead of "Can not load face (unknown file format; error code 0x2)" --- src/ft2font.cpp | 108 ++++++++++++------------------------------------ src/ft2font.h | 31 ++++++++++++-- 2 files changed, 55 insertions(+), 84 deletions(-) diff --git a/src/ft2font.cpp b/src/ft2font.cpp index b2c2c0fa9bd1..bdfa2873ca80 100644 --- a/src/ft2font.cpp +++ b/src/ft2font.cpp @@ -43,26 +43,6 @@ FT_Library _ft2Library; -// FreeType error codes; loaded as per fterror.h. -static char const* ft_error_string(FT_Error error) { -#undef __FTERRORS_H__ -#define FT_ERROR_START_LIST switch (error) { -#define FT_ERRORDEF( e, v, s ) case v: return s; -#define FT_ERROR_END_LIST default: return NULL; } -#include FT_ERRORS_H -} - -void throw_ft_error(std::string message, FT_Error error) { - char const* s = ft_error_string(error); - std::ostringstream os(""); - if (s) { - os << message << " (" << s << "; error code 0x" << std::hex << error << ")"; - } else { // Should not occur, but don't add another error from failed lookup. - os << message << " (error code 0x" << std::hex << error << ")"; - } - throw std::runtime_error(os.str()); -} - FT2Image::FT2Image(unsigned long width, unsigned long height) : m_buffer((unsigned char *)calloc(width * height, 1)), m_width(width), m_height(height) { @@ -237,26 +217,16 @@ FT2Font::FT2Font(FT_Open_Args &open_args, kerning_factor(0) { clear(); - - FT_Error error = FT_Open_Face(_ft2Library, &open_args, 0, &face); - if (error) { - throw_ft_error("Can not load face", error); - } - - // set a default fontsize 12 pt at 72dpi - error = FT_Set_Char_Size(face, 12 * 64, 0, 72 * (unsigned int)hinting_factor, 72); - if (error) { - FT_Done_Face(face); - throw_ft_error("Could not set the fontsize", error); - } - + FT_CHECK(FT_Open_Face, _ft2Library, &open_args, 0, &face); if (open_args.stream != nullptr) { face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM; } - - FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 }; - FT_Set_Transform(face, &transform, nullptr); - + try { + set_size(12., 72.); // Set a default fontsize 12 pt at 72dpi. + } catch (...) { + FT_Done_Face(face); + throw; + } // Set fallbacks std::copy(fallback_list.begin(), fallback_list.end(), std::back_inserter(fallbacks)); } @@ -293,11 +263,9 @@ void FT2Font::clear() void FT2Font::set_size(double ptsize, double dpi) { - FT_Error error = FT_Set_Char_Size( + FT_CHECK( + FT_Set_Char_Size, face, (FT_F26Dot6)(ptsize * 64), 0, (FT_UInt)(dpi * hinting_factor), (FT_UInt)dpi); - if (error) { - throw_ft_error("Could not set the fontsize", error); - } FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 }; FT_Set_Transform(face, &transform, nullptr); @@ -311,17 +279,12 @@ void FT2Font::set_charmap(int i) if (i >= face->num_charmaps) { throw std::runtime_error("i exceeds the available number of char maps"); } - FT_CharMap charmap = face->charmaps[i]; - if (FT_Error error = FT_Set_Charmap(face, charmap)) { - throw_ft_error("Could not set the charmap", error); - } + FT_CHECK(FT_Set_Charmap, face, face->charmaps[i]); } void FT2Font::select_charmap(unsigned long i) { - if (FT_Error error = FT_Select_Charmap(face, (FT_Encoding)i)) { - throw_ft_error("Could not set the charmap", error); - } + FT_CHECK(FT_Select_Charmap, face, (FT_Encoding)i); } int FT2Font::get_kerning(FT_UInt left, FT_UInt right, FT_Kerning_Mode mode, @@ -477,10 +440,10 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool if (!was_found) { ft_glyph_warn(charcode, glyph_seen_fonts); if (charcode_error) { - throw_ft_error("Could not load charcode", charcode_error); + THROW_FT_ERROR("charcode loading", charcode_error); } else if (glyph_error) { - throw_ft_error("Could not load charcode", glyph_error); + THROW_FT_ERROR("charcode loading", glyph_error); } } else if (ft_object_with_glyph->warn_if_used) { ft_glyph_warn(charcode, glyph_seen_fonts); @@ -494,13 +457,9 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool glyph_seen_fonts.insert((face != nullptr)?face->family_name: nullptr); ft_glyph_warn((FT_ULong)charcode, glyph_seen_fonts); } - if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) { - throw_ft_error("Could not load charcode", error); - } + FT_CHECK(FT_Load_Glyph, face, glyph_index, flags); FT_Glyph thisGlyph; - if (FT_Error error = FT_Get_Glyph(face->glyph, &thisGlyph)) { - throw_ft_error("Could not get glyph", error); - } + FT_CHECK(FT_Get_Glyph, face->glyph, &thisGlyph); glyphs.push_back(thisGlyph); } } @@ -600,13 +559,9 @@ void FT2Font::load_glyph(FT_UInt glyph_index, void FT2Font::load_glyph(FT_UInt glyph_index, FT_Int32 flags) { - if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) { - throw_ft_error("Could not load glyph", error); - } + FT_CHECK(FT_Load_Glyph, face, glyph_index, flags); FT_Glyph thisGlyph; - if (FT_Error error = FT_Get_Glyph(face->glyph, &thisGlyph)) { - throw_ft_error("Could not get glyph", error); - } + FT_CHECK(FT_Get_Glyph, face->glyph, &thisGlyph); glyphs.push_back(thisGlyph); } @@ -651,13 +606,10 @@ void FT2Font::draw_glyphs_to_bitmap(bool antialiased) image = py::array_t{{height, width}}; std::memset(image.mutable_data(0), 0, image.nbytes()); - for (auto & glyph : glyphs) { - FT_Error error = FT_Glyph_To_Bitmap( + for (auto & glyph: glyphs) { + FT_CHECK( + FT_Glyph_To_Bitmap, &glyph, antialiased ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, nullptr, 1); - if (error) { - throw_ft_error("Could not convert glyph to bitmap", error); - } - FT_BitmapGlyph bitmap = (FT_BitmapGlyph)glyph; // now, draw to our target surface (convert position) @@ -681,16 +633,12 @@ void FT2Font::draw_glyph_to_bitmap( throw std::runtime_error("glyph num is out of range"); } - FT_Error error = FT_Glyph_To_Bitmap( - &glyphs[glyphInd], - antialiased ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, - &sub_offset, // additional translation - 1 // destroy image - ); - if (error) { - throw_ft_error("Could not convert glyph to bitmap", error); - } - + FT_CHECK( + FT_Glyph_To_Bitmap, + &glyphs[glyphInd], + antialiased ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, + &sub_offset, // additional translation + 1); // destroy image FT_BitmapGlyph bitmap = (FT_BitmapGlyph)glyphs[glyphInd]; draw_bitmap(im, &bitmap->bitmap, x + bitmap->left, y); @@ -715,9 +663,7 @@ void FT2Font::get_glyph_name(unsigned int glyph_number, std::string &buffer, throw std::runtime_error("Failed to convert glyph to standard name"); } } else { - if (FT_Error error = FT_Get_Glyph_Name(face, glyph_number, buffer.data(), buffer.size())) { - throw_ft_error("Could not get glyph names", error); - } + FT_CHECK(FT_Get_Glyph_Name, face, glyph_number, buffer.data(), buffer.size()); auto len = buffer.find('\0'); if (len != buffer.npos) { buffer.resize(len); diff --git a/src/ft2font.h b/src/ft2font.h index 209581d8f362..e1ebdb934329 100644 --- a/src/ft2font.h +++ b/src/ft2font.h @@ -6,6 +6,7 @@ #ifndef MPL_FT2FONT_H #define MPL_FT2FONT_H +#include #include #include #include @@ -26,12 +27,36 @@ extern "C" { #include namespace py = pybind11; -/* - By definition, FT_FIXED as 2 16bit values stored in a single long. - */ +// By definition, FT_FIXED as 2 16bit values stored in a single long. #define FIXED_MAJOR(val) (signed short)((val & 0xffff0000) >> 16) #define FIXED_MINOR(val) (unsigned short)(val & 0xffff) +// Error handling (error codes are loaded as described in fterror.h). +inline char const* ft_error_string(FT_Error error) { +#undef __FTERRORS_H__ +#define FT_ERROR_START_LIST switch (error) { +#define FT_ERRORDEF( e, v, s ) case v: return s; +#define FT_ERROR_END_LIST default: return NULL; } +#include FT_ERRORS_H +} + +// No more than 16 hex digits + "0x" + null byte for a 64-bit int error. +#define THROW_FT_ERROR(name, err) { \ + char buf[20] = {0}; \ + sprintf(buf, "%#04x", err); \ + throw std::runtime_error{ \ + name " (" \ + + std::filesystem::path(__FILE__).filename().string() \ + + " line " + std::to_string(__LINE__) + ") failed with error " \ + + std::string{buf} + ": " + std::string{ft_error_string(err)}}; \ +} (void)0 + +#define FT_CHECK(func, ...) { \ + if (auto const& error_ = func(__VA_ARGS__)) { \ + THROW_FT_ERROR(#func, error_); \ + } \ +} (void)0 + // the FreeType string rendered into a width, height buffer class FT2Image { From 05b0a4eee551783df1df7651a21ed77db68e8214 Mon Sep 17 00:00:00 2001 From: Ruth Comer <10599679+rcomer@users.noreply.github.com> Date: Mon, 26 May 2025 08:24:21 +0100 Subject: [PATCH 16/47] DOC: expand petroff10 example to include 6- and 8- styles --- galleries/examples/style_sheets/petroff10.py | 32 ++++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/galleries/examples/style_sheets/petroff10.py b/galleries/examples/style_sheets/petroff10.py index f6293fd40a6b..5683a4df296c 100644 --- a/galleries/examples/style_sheets/petroff10.py +++ b/galleries/examples/style_sheets/petroff10.py @@ -1,13 +1,13 @@ """ -===================== -Petroff10 style sheet -===================== +==================== +Petroff style sheets +==================== -This example demonstrates the "petroff10" style, which implements the 10-color -sequence developed by Matthew A. Petroff [1]_ for accessible data visualization. -The style balances aesthetics with accessibility considerations, making it -suitable for various types of plots while ensuring readability and distinction -between data series. +This example demonstrates the "petroffN" styles, which implement the 6-, 8- and +10-color sequences developed by Matthew A. Petroff [1]_ for accessible data +visualization. The styles balance aesthetics with accessibility considerations, +making them suitable for various types of plots while ensuring readability and +distinction between data series. .. [1] https://arxiv.org/abs/2107.02270 @@ -35,9 +35,15 @@ def image_and_patch_example(ax): c = plt.Circle((5, 5), radius=5, label='patch') ax.add_patch(c) -plt.style.use('petroff10') -fig, (ax1, ax2) = plt.subplots(ncols=2, figsize=(12, 5)) -fig.suptitle("'petroff10' style sheet") -colored_lines_example(ax1) -image_and_patch_example(ax2) + +fig = plt.figure(figsize=(6.4, 9.6), layout='compressed') +sfigs = fig.subfigures(nrows=3) + +for style, sfig in zip(['petroff6', 'petroff8', 'petroff10'], sfigs): + sfig.suptitle(f"'{style}' style sheet") + with plt.style.context(style): + ax1, ax2 = sfig.subplots(ncols=2) + colored_lines_example(ax1) + image_and_patch_example(ax2) + plt.show() From 4af03f44b6be8dce3651d7a93a593e110998dbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trygve=20Magnus=20R=C3=A6der?= Date: Mon, 26 May 2025 20:16:00 +0200 Subject: [PATCH 17/47] Update to docs with regards to colorbar and colorizer --- .../images_contours_and_fields/multi_image.py | 46 ++++++------------- .../users_explain/colors/colorbar_only.py | 37 ++++++++++----- lib/matplotlib/colorbar.py | 12 +++-- lib/matplotlib/figure.py | 9 ++-- 4 files changed, 51 insertions(+), 53 deletions(-) diff --git a/galleries/examples/images_contours_and_fields/multi_image.py b/galleries/examples/images_contours_and_fields/multi_image.py index 4e6f6cc54a79..9769dbf5219d 100644 --- a/galleries/examples/images_contours_and_fields/multi_image.py +++ b/galleries/examples/images_contours_and_fields/multi_image.py @@ -11,15 +11,16 @@ value *x* in the image). If we want one colorbar to be representative for multiple images, we have -to explicitly ensure consistent data coloring by using the same data -normalization for all the images. We ensure this by explicitly creating a -``norm`` object that we pass to all the image plotting methods. +to explicitly ensure consistent data coloring by using the same +data-to-color pipeline for all the images. We ensure this by explicitly +creating a `matplotlib.colorizer.Colorizer` object that we pass to all +the image plotting methods. """ import matplotlib.pyplot as plt import numpy as np -from matplotlib import colors +import matplotlib as mpl np.random.seed(19680801) @@ -31,12 +32,13 @@ fig, axs = plt.subplots(2, 2) fig.suptitle('Multiple images') -# create a single norm to be shared across all images -norm = colors.Normalize(vmin=np.min(datasets), vmax=np.max(datasets)) +# create a single norm and colorizer to be shared across all images +norm = mpl.colors.Normalize(vmin=np.min(datasets), vmax=np.max(datasets)) +colorizer = mpl.colorizer.Colorizer(norm=norm) images = [] for ax, data in zip(axs.flat, datasets): - images.append(ax.imshow(data, norm=norm)) + images.append(ax.imshow(data, colorizer=colorizer)) fig.colorbar(images[0], ax=axs, orientation='horizontal', fraction=.1) @@ -45,30 +47,10 @@ # %% # The colors are now kept consistent across all images when changing the # scaling, e.g. through zooming in the colorbar or via the "edit axis, -# curves and images parameters" GUI of the Qt backend. This is sufficient -# for most practical use cases. -# -# Advanced: Additionally sync the colormap -# ---------------------------------------- -# -# Sharing a common norm object guarantees synchronized scaling because scale -# changes modify the norm object in-place and thus propagate to all images -# that use this norm. This approach does not help with synchronizing colormaps -# because changing the colormap of an image (e.g. through the "edit axis, -# curves and images parameters" GUI of the Qt backend) results in the image -# referencing the new colormap object. Thus, the other images are not updated. -# -# To update the other images, sync the -# colormaps using the following code:: -# -# def sync_cmaps(changed_image): -# for im in images: -# if changed_image.get_cmap() != im.get_cmap(): -# im.set_cmap(changed_image.get_cmap()) -# -# for im in images: -# im.callbacks.connect('changed', sync_cmaps) -# +# curves and images parameters" GUI of the Qt backend. Additionally, +# if the colormap of the colorizer is changed, (e.g. through the "edit +# axis, curves and images parameters" GUI of the Qt backend) this change +# propagates to the other plots and the colorbar. # # .. admonition:: References # @@ -77,6 +59,6 @@ # # - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow` # - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar` +# - `matplotlib.colorizer.Colorizer` # - `matplotlib.colors.Normalize` -# - `matplotlib.cm.ScalarMappable.set_cmap` # - `matplotlib.cbook.CallbackRegistry.connect` diff --git a/galleries/users_explain/colors/colorbar_only.py b/galleries/users_explain/colors/colorbar_only.py index a3f1d62042f4..ee97e91162ae 100644 --- a/galleries/users_explain/colors/colorbar_only.py +++ b/galleries/users_explain/colors/colorbar_only.py @@ -8,10 +8,11 @@ This tutorial shows how to build and customize standalone colorbars, i.e. without an attached plot. -A `~.Figure.colorbar` needs a "mappable" (`matplotlib.cm.ScalarMappable`) -object (typically, an image) which indicates the colormap and the norm to be -used. In order to create a colorbar without an attached image, one can instead -use a `.ScalarMappable` with no associated data. +A `~.Figure.colorbar` needs a "mappable" (`matplotlib.colorizer.ColorizingArtist`) +object (typically, an image) which contains a colorizer +(`matplotlib.colorizer.Colorizer`) that holds the data-to-color pipeline (norm and +colormap). In order to create a colorbar without an attached image, one can instead +use a `.ColorizingArtist` with no associated data. """ import matplotlib.pyplot as plt @@ -23,9 +24,11 @@ # ------------------------- # Here, we create a basic continuous colorbar with ticks and labels. # -# The arguments to the `~.Figure.colorbar` call are the `.ScalarMappable` -# (constructed using the *norm* and *cmap* arguments), the axes where the -# colorbar should be drawn, and the colorbar's orientation. +# The arguments to the `~.Figure.colorbar` call are a `.ColorizingArtist`, +# the axes where the colorbar should be drawn, and the colorbar's orientation. +# To crate a `.ColorizingArtist` one must first make `.Colorizer` that holds the +# desired *norm* and *cmap*. +# # # For more information see the `~matplotlib.colorbar` API. @@ -33,7 +36,9 @@ norm = mpl.colors.Normalize(vmin=5, vmax=10) -fig.colorbar(mpl.cm.ScalarMappable(norm=norm, cmap="cool"), +colorizer = mpl.colorizer.Colorizer(norm=norm, cmap="cool") + +fig.colorbar(mpl.colorizer.ColorizingArtist(colorizer), cax=ax, orientation='horizontal', label='Some Units') # %% @@ -47,7 +52,9 @@ fig, ax = plt.subplots(layout='constrained') -fig.colorbar(mpl.cm.ScalarMappable(norm=mpl.colors.Normalize(0, 1), cmap='magma'), +colorizer = mpl.colorizer.Colorizer(norm=mpl.colors.Normalize(0, 1), cmap='magma') + +fig.colorbar(mpl.colorizer.ColorizingArtist(colorizer), ax=ax, orientation='vertical', label='a colorbar label') # %% @@ -65,7 +72,9 @@ bounds = [-1, 2, 5, 7, 12, 15] norm = mpl.colors.BoundaryNorm(bounds, cmap.N, extend='both') -fig.colorbar(mpl.cm.ScalarMappable(norm=norm, cmap="viridis"), +colorizer = mpl.colorizer.Colorizer(norm=norm, cmap='viridis') + +fig.colorbar(mpl.colorizer.ColorizingArtist(colorizer), cax=ax, orientation='horizontal', label="Discrete intervals with extend='both' keyword") @@ -94,8 +103,10 @@ bounds = [1, 2, 4, 7, 8] norm = mpl.colors.BoundaryNorm(bounds, cmap.N) +colorizer = mpl.colorizer.Colorizer(norm=norm, cmap=cmap) + fig.colorbar( - mpl.cm.ScalarMappable(cmap=cmap, norm=norm), + mpl.colorizer.ColorizingArtist(colorizer), cax=ax, orientation='horizontal', extend='both', spacing='proportional', @@ -116,8 +127,10 @@ bounds = [-1.0, -0.5, 0.0, 0.5, 1.0] norm = mpl.colors.BoundaryNorm(bounds, cmap.N) +colorizer = mpl.colorizer.Colorizer(norm=norm, cmap=cmap) + fig.colorbar( - mpl.cm.ScalarMappable(cmap=cmap, norm=norm), + mpl.colorizer.ColorizingArtist(colorizer), cax=ax, orientation='horizontal', extend='both', extendfrac='auto', spacing='uniform', diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py index db33698c5514..19bdbe605d88 100644 --- a/lib/matplotlib/colorbar.py +++ b/lib/matplotlib/colorbar.py @@ -16,8 +16,9 @@ import numpy as np import matplotlib as mpl -from matplotlib import _api, cbook, collections, cm, colors, contour, ticker +from matplotlib import _api, cbook, collections, colors, contour, ticker import matplotlib.artist as martist +import matplotlib.colorizer as mcolorizer import matplotlib.patches as mpatches import matplotlib.path as mpath import matplotlib.spines as mspines @@ -199,12 +200,12 @@ class Colorbar: Draw a colorbar in an existing Axes. Typically, colorbars are created using `.Figure.colorbar` or - `.pyplot.colorbar` and associated with `.ScalarMappable`\s (such as an + `.pyplot.colorbar` and associated with `.ColorizingArtist`\s (such as an `.AxesImage` generated via `~.axes.Axes.imshow`). In order to draw a colorbar not associated with other elements in the figure, e.g. when showing a colormap by itself, one can create an empty - `.ScalarMappable`, or directly pass *cmap* and *norm* instead of *mappable* + `.ColorizingArtist`, or directly pass *cmap* and *norm* instead of *mappable* to `Colorbar`. Useful public methods are :meth:`set_label` and :meth:`add_lines`. @@ -244,7 +245,7 @@ def __init__( ax : `~matplotlib.axes.Axes` The `~.axes.Axes` instance in which the colorbar is drawn. - mappable : `.ScalarMappable` + mappable : `.ColorizingArtist` The mappable whose colormap and norm will be used. To show the colors versus index instead of on a 0-1 scale, set the @@ -288,7 +289,8 @@ def __init__( colorbar and at the right for a vertical. """ if mappable is None: - mappable = cm.ScalarMappable(norm=norm, cmap=cmap) + colorizer = mcolorizer.Colorizer(norm=norm, cmap=cmap) + mappable = mcolorizer.ColorizingArtist(colorizer) self.mappable = mappable cmap = mappable.cmap diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py index bf4e2253324f..c15da7597acd 100644 --- a/lib/matplotlib/figure.py +++ b/lib/matplotlib/figure.py @@ -1200,17 +1200,18 @@ def colorbar( Parameters ---------- mappable - The `matplotlib.cm.ScalarMappable` (i.e., `.AxesImage`, + The `matplotlib.colorizer.ColorizingArtist` (i.e., `.AxesImage`, `.ContourSet`, etc.) described by this colorbar. This argument is mandatory for the `.Figure.colorbar` method but optional for the `.pyplot.colorbar` function, which sets the default to the current image. - Note that one can create a `.ScalarMappable` "on-the-fly" to - generate colorbars not attached to a previously drawn artist, e.g. + Note that one can create a `.colorizer.ColorizingArtist` "on-the-fly" + to generate colorbars not attached to a previously drawn artist, e.g. :: - fig.colorbar(cm.ScalarMappable(norm=norm, cmap=cmap), ax=ax) + cr = colorizer.Colorizer(norm=norm, cmap=cmap) + fig.colorbar(colorizer.ColorizingArtist(cr), ax=ax) cax : `~matplotlib.axes.Axes`, optional Axes into which the colorbar will be drawn. If `None`, then a new From 46255ae65bf61d0defae7729ec826189c7016189 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 23 May 2025 14:08:57 +0200 Subject: [PATCH 18/47] Use fix-cm instead of type1cm. ... to fix unicode glyph sizing issues for svg & patheffects. --- doc/install/dependencies.rst | 3 ++- lib/matplotlib/mpl-data/matplotlibrc | 2 +- .../mpl-data/stylelib/classic.mplstyle | 4 ++-- lib/matplotlib/tests/test_backend_svg.py | 2 +- lib/matplotlib/tests/test_usetex.py | 7 +++++++ lib/matplotlib/texmanager.py | 19 ++++++++++++------- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/doc/install/dependencies.rst b/doc/install/dependencies.rst index 712846771cc6..4b006d9016e2 100644 --- a/doc/install/dependencies.rst +++ b/doc/install/dependencies.rst @@ -443,7 +443,8 @@ will often automatically include these collections. | | `lm `_, | | | `txfonts `_ | +-----------------------------+--------------------------------------------------+ -| collection-latex | `geometry `_, | +| collection-latex | `fix-cm `_, | +| | `geometry `_, | | | `hyperref `_, | | | `latex `_, | | | latex-bin, | diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc index acb131c82e6c..780dcd377041 100644 --- a/lib/matplotlib/mpl-data/matplotlibrc +++ b/lib/matplotlib/mpl-data/matplotlibrc @@ -339,7 +339,7 @@ # become quite long. # The following packages are always loaded with usetex, # so beware of package collisions: - # geometry, inputenc, type1cm. + # color, fix-cm, geometry, graphicx, textcomp. # PostScript (PSNFSS) font packages may also be # loaded, depending on your font settings. diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle index 6cba66076ac7..92624503f99e 100644 --- a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle +++ b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle @@ -122,8 +122,8 @@ text.latex.preamble : # IMPROPER USE OF THIS FEATURE WILL LEAD TO LATEX FAILURE # Note that it has to be put on a single line, which may # become quite long. # The following packages are always loaded with usetex, so - # beware of package collisions: color, geometry, graphicx, - # type1cm, textcomp. + # beware of package collisions: + # color, fix-cm, geometry, graphicx, textcomp. # Adobe Postscript (PSSNFS) font packages may also be # loaded, depending on your font settings. diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py index d2d4042870a1..2c64b7c24b3e 100644 --- a/lib/matplotlib/tests/test_backend_svg.py +++ b/lib/matplotlib/tests/test_backend_svg.py @@ -216,7 +216,7 @@ def test_unicode_won(): tree = xml.etree.ElementTree.fromstring(buf) ns = 'http://www.w3.org/2000/svg' - won_id = 'SFSS3583-8e' + won_id = 'SFSS1728-8e' assert len(tree.findall(f'.//{{{ns}}}path[@d][@id="{won_id}"]')) == 1 assert f'#{won_id}' in tree.find(f'.//{{{ns}}}use').attrib.values() diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py index c7658c4f42ac..0b6d6d5e5535 100644 --- a/lib/matplotlib/tests/test_usetex.py +++ b/lib/matplotlib/tests/test_usetex.py @@ -185,3 +185,10 @@ def test_rotation(): # 'My' checks full height letters plus descenders. ax.text(x, y, f"$\\mathrm{{My {text[ha]}{text[va]} {angle}}}$", rotation=angle, horizontalalignment=ha, verticalalignment=va) + + +def test_unicode_sizing(): + tp = mpl.textpath.TextToPath() + scale1 = tp.get_glyphs_tex(mpl.font_manager.FontProperties(), "W")[0][0][3] + scale2 = tp.get_glyphs_tex(mpl.font_manager.FontProperties(), r"\textwon")[0][0][3] + assert scale1 == scale2 diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py index 94fc94e9e840..020a26e31cbe 100644 --- a/lib/matplotlib/texmanager.py +++ b/lib/matplotlib/texmanager.py @@ -67,6 +67,13 @@ class TexManager: _grey_arrayd = {} _font_families = ('serif', 'sans-serif', 'cursive', 'monospace') + # Check for the cm-super package (which registers unicode computer modern + # support just by being installed) without actually loading any package + # (because we already load the incompatible fix-cm). + _check_cmsuper_installed = ( + r'\IfFileExists{type1ec.sty}{}{\PackageError{matplotlib-support}{' + r'Missing cm-super package, required by Matplotlib}{}}' + ) _font_preambles = { 'new century schoolbook': r'\renewcommand{\rmdefault}{pnc}', 'bookman': r'\renewcommand{\rmdefault}{pbk}', @@ -80,13 +87,10 @@ class TexManager: 'helvetica': r'\usepackage{helvet}', 'avant garde': r'\usepackage{avant}', 'courier': r'\usepackage{courier}', - # Loading the type1ec package ensures that cm-super is installed, which - # is necessary for Unicode computer modern. (It also allows the use of - # computer modern at arbitrary sizes, but that's just a side effect.) - 'monospace': r'\usepackage{type1ec}', - 'computer modern roman': r'\usepackage{type1ec}', - 'computer modern sans serif': r'\usepackage{type1ec}', - 'computer modern typewriter': r'\usepackage{type1ec}', + 'monospace': _check_cmsuper_installed, + 'computer modern roman': _check_cmsuper_installed, + 'computer modern sans serif': _check_cmsuper_installed, + 'computer modern typewriter': _check_cmsuper_installed, } _font_types = { 'new century schoolbook': 'serif', @@ -200,6 +204,7 @@ def _get_tex_source(cls, tex, fontsize): font_preamble, fontcmd = cls._get_font_preamble_and_command() baselineskip = 1.25 * fontsize return "\n".join([ + r"\RequirePackage{fix-cm}", r"\documentclass{article}", r"% Pass-through \mathdefault, which is used in non-usetex mode", r"% to use the default text font but was historically suppressed", From b18407b13a89e7b13c238bf7b13a06222fc18626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 May 2025 17:20:42 +0200 Subject: [PATCH 19/47] Bump scientific-python/circleci-artifacts-redirector-action (#30113) Bumps the actions group with 1 update: [scientific-python/circleci-artifacts-redirector-action](https://github.com/scientific-python/circleci-artifacts-redirector-action). Updates `scientific-python/circleci-artifacts-redirector-action` from 1.0.0 to 1.1.0 - [Release notes](https://github.com/scientific-python/circleci-artifacts-redirector-action/releases) - [Commits](https://github.com/scientific-python/circleci-artifacts-redirector-action/compare/4e13a10d89177f4bfc8007a7064bdbeda848d8d1...7eafdb60666f57706a5525a2f5eb76224dc8779b) --- updated-dependencies: - dependency-name: scientific-python/circleci-artifacts-redirector-action dependency-version: 1.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index f0ae304882e7..d61db3f14345 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -11,7 +11,7 @@ jobs: steps: - name: GitHub Action step uses: - scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1 # v1.0.0 + scientific-python/circleci-artifacts-redirector-action@7eafdb60666f57706a5525a2f5eb76224dc8779b # v1.1.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} api-token: ${{ secrets.CIRCLECI_TOKEN }} From 42f1905ce52625034f6b029a7e3e4737f3cf13b3 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Thu, 29 May 2025 17:24:16 +0200 Subject: [PATCH 20/47] Fix _is_tensorflow_array. (#30114) The previous implementation was clearly wrong (the isinstance check would raise TypeError as the second argument would be a bool), but the tests didn't catch that because the bug led to _is_tensorflow_array returning False, then _unpack_to_numpy returning the original input, and then assert_array_equal implicitly converting `result` by calling `__array__` on it. Fix the test by explicitly checking that `result` is indeed a numpy array, and also fix _is_tensorflow_array with more restrictive exception catching (also applied to _is_torch_array, _is_jax_array, and _is_pandas_dataframe, while we're at it). --- lib/matplotlib/cbook.py | 78 +++++++++++++++--------------- lib/matplotlib/tests/test_cbook.py | 3 ++ 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py index 10048f1be782..3100cc4da81d 100644 --- a/lib/matplotlib/cbook.py +++ b/lib/matplotlib/cbook.py @@ -2331,42 +2331,56 @@ def _picklable_class_constructor(mixin_class, fmt, attr_name, base_class): def _is_torch_array(x): - """Check if 'x' is a PyTorch Tensor.""" + """Return whether *x* is a PyTorch Tensor.""" try: - # we're intentionally not attempting to import torch. If somebody - # has created a torch array, torch should already be in sys.modules - return isinstance(x, sys.modules['torch'].Tensor) - except Exception: # TypeError, KeyError, AttributeError, maybe others? - # we're attempting to access attributes on imported modules which - # may have arbitrary user code, so we deliberately catch all exceptions - return False + # We're intentionally not attempting to import torch. If somebody + # has created a torch array, torch should already be in sys.modules. + tp = sys.modules.get("torch").Tensor + except AttributeError: + return False # Module not imported or a nonstandard module with no Tensor attr. + return (isinstance(tp, type) # Just in case it's a very nonstandard module. + and isinstance(x, tp)) def _is_jax_array(x): - """Check if 'x' is a JAX Array.""" + """Return whether *x* is a JAX Array.""" try: - # we're intentionally not attempting to import jax. If somebody - # has created a jax array, jax should already be in sys.modules - return isinstance(x, sys.modules['jax'].Array) - except Exception: # TypeError, KeyError, AttributeError, maybe others? - # we're attempting to access attributes on imported modules which - # may have arbitrary user code, so we deliberately catch all exceptions - return False + # We're intentionally not attempting to import jax. If somebody + # has created a jax array, jax should already be in sys.modules. + tp = sys.modules.get("jax").Array + except AttributeError: + return False # Module not imported or a nonstandard module with no Array attr. + return (isinstance(tp, type) # Just in case it's a very nonstandard module. + and isinstance(x, tp)) + + +def _is_pandas_dataframe(x): + """Check if *x* is a Pandas DataFrame.""" + try: + # We're intentionally not attempting to import Pandas. If somebody + # has created a Pandas DataFrame, Pandas should already be in sys.modules. + tp = sys.modules.get("pandas").DataFrame + except AttributeError: + return False # Module not imported or a nonstandard module with no Array attr. + return (isinstance(tp, type) # Just in case it's a very nonstandard module. + and isinstance(x, tp)) def _is_tensorflow_array(x): - """Check if 'x' is a TensorFlow Tensor or Variable.""" + """Return whether *x* is a TensorFlow Tensor or Variable.""" try: - # we're intentionally not attempting to import TensorFlow. If somebody - # has created a TensorFlow array, TensorFlow should already be in sys.modules - # we use `is_tensor` to not depend on the class structure of TensorFlow - # arrays, as `tf.Variables` are not instances of `tf.Tensor` - # (they both convert the same way) - return isinstance(x, sys.modules['tensorflow'].is_tensor(x)) - except Exception: # TypeError, KeyError, AttributeError, maybe others? - # we're attempting to access attributes on imported modules which - # may have arbitrary user code, so we deliberately catch all exceptions + # We're intentionally not attempting to import TensorFlow. If somebody + # has created a TensorFlow array, TensorFlow should already be in + # sys.modules we use `is_tensor` to not depend on the class structure + # of TensorFlow arrays, as `tf.Variables` are not instances of + # `tf.Tensor` (they both convert the same way). + is_tensor = sys.modules.get("tensorflow").is_tensor + except AttributeError: return False + try: + return is_tensor(x) + except Exception: + return False # Just in case it's a very nonstandard module. def _unpack_to_numpy(x): @@ -2421,15 +2435,3 @@ def _auto_format_str(fmt, value): return fmt % (value,) except (TypeError, ValueError): return fmt.format(value) - - -def _is_pandas_dataframe(x): - """Check if 'x' is a Pandas DataFrame.""" - try: - # we're intentionally not attempting to import Pandas. If somebody - # has created a Pandas DataFrame, Pandas should already be in sys.modules - return isinstance(x, sys.modules['pandas'].DataFrame) - except Exception: # TypeError, KeyError, AttributeError, maybe others? - # we're attempting to access attributes on imported modules which - # may have arbitrary user code, so we deliberately catch all exceptions - return False diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py index 7cb057cf4723..9b97d8e7e231 100644 --- a/lib/matplotlib/tests/test_cbook.py +++ b/lib/matplotlib/tests/test_cbook.py @@ -1000,6 +1000,7 @@ def __array__(self): torch_tensor = torch.Tensor(data) result = cbook._unpack_to_numpy(torch_tensor) + assert isinstance(result, np.ndarray) # compare results, do not check for identity: the latter would fail # if not mocked, and the implementation does not guarantee it # is the same Python object, just the same values. @@ -1028,6 +1029,7 @@ def __array__(self): jax_array = jax.Array(data) result = cbook._unpack_to_numpy(jax_array) + assert isinstance(result, np.ndarray) # compare results, do not check for identity: the latter would fail # if not mocked, and the implementation does not guarantee it # is the same Python object, just the same values. @@ -1057,6 +1059,7 @@ def __array__(self): tf_tensor = tensorflow.Tensor(data) result = cbook._unpack_to_numpy(tf_tensor) + assert isinstance(result, np.ndarray) # compare results, do not check for identity: the latter would fail # if not mocked, and the implementation does not guarantee it # is the same Python object, just the same values. From ea5d85f67d4aeda04a94e3842217f89130e62cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Thu, 29 May 2025 18:01:29 +0300 Subject: [PATCH 21/47] Add some types to _mathtext.py Mypy 1.16.0 flags errors here: lib/matplotlib/_mathtext.py:2531: error: "Node" has no attribute "width" [attr-defined] lib/matplotlib/_mathtext.py:2608: error: List item 0 has incompatible type "Kern"; expected "Hlist | Vlist" [list-item] The check for the attribute _metrics is equivalent to checking for an instance of Char, since only Char and its subclasses set self._metrics. Mypy infers an unnecessarily tight type list[Hlist | Vlist] for spaced_nucleus so we give it a more general one. --- lib/matplotlib/_mathtext.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py index a528a65ca3cb..19ddbb6d0883 100644 --- a/lib/matplotlib/_mathtext.py +++ b/lib/matplotlib/_mathtext.py @@ -2524,10 +2524,10 @@ def subsuper(self, s: str, loc: int, toks: ParseResults) -> T.Any: if len(new_children): # remove last kern if (isinstance(new_children[-1], Kern) and - hasattr(new_children[-2], '_metrics')): + isinstance(new_children[-2], Char)): new_children = new_children[:-1] last_char = new_children[-1] - if hasattr(last_char, '_metrics'): + if isinstance(last_char, Char): last_char.width = last_char._metrics.advance # create new Hlist without kerning nucleus = Hlist(new_children, do_kern=False) @@ -2603,7 +2603,7 @@ def subsuper(self, s: str, loc: int, toks: ParseResults) -> T.Any: # Do we need to add a space after the nucleus? # To find out, check the flag set by operatorname - spaced_nucleus = [nucleus, x] + spaced_nucleus: list[Node] = [nucleus, x] if self._in_subscript_or_superscript: spaced_nucleus += [self._make_space(self._space_widths[r'\,'])] self._in_subscript_or_superscript = False From 48a9d7ccb8024912e67c4317c9ef39ce8badf16b Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Thu, 29 May 2025 11:52:24 +0200 Subject: [PATCH 22/47] CI: Skip jobs on forks --- .github/workflows/cibuildwheel.yml | 38 +++++++++++++++------------ .github/workflows/codeql-analysis.yml | 1 + .github/workflows/conflictcheck.yml | 1 + 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index 9ced8e2f5060..a05d3ccc330c 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -24,14 +24,16 @@ permissions: jobs: build_sdist: if: >- - github.event_name == 'push' || - github.event_name == 'pull_request' && ( - ( - github.event.action == 'labeled' && - github.event.label.name == 'CI: Run cibuildwheel' - ) || - contains(github.event.pull_request.labels.*.name, - 'CI: Run cibuildwheel') + github.repository == 'matplotlib/matplotlib' && ( + github.event_name == 'push' || + github.event_name == 'pull_request' && ( + ( + github.event.action == 'labeled' && + github.event.label.name == 'CI: Run cibuildwheel' + ) || + contains(github.event.pull_request.labels.*.name, + 'CI: Run cibuildwheel') + ) ) name: Build sdist runs-on: ubuntu-latest @@ -78,14 +80,16 @@ jobs: build_wheels: if: >- - github.event_name == 'push' || - github.event_name == 'pull_request' && ( - ( - github.event.action == 'labeled' && - github.event.label.name == 'CI: Run cibuildwheel' - ) || - contains(github.event.pull_request.labels.*.name, - 'CI: Run cibuildwheel') + github.repository == 'matplotlib/matplotlib' && ( + github.event_name == 'push' || + github.event_name == 'pull_request' && ( + ( + github.event.action == 'labeled' && + github.event.label.name == 'CI: Run cibuildwheel' + ) || + contains(github.event.pull_request.labels.*.name, + 'CI: Run cibuildwheel') + ) ) needs: build_sdist name: Build wheels on ${{ matrix.os }} for ${{ matrix.cibw_archs }} @@ -183,7 +187,7 @@ jobs: if-no-files-found: error publish: - if: github.event_name == 'push' && github.ref_type == 'tag' + if: github.repository == 'matplotlib/matplotlib' && github.event_name == 'push' && github.ref_type == 'tag' name: Upload release to PyPI needs: [build_sdist, build_wheels] runs-on: ubuntu-latest diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0e8c723bb6f8..3f71e1369834 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,6 +12,7 @@ on: jobs: analyze: + if: github.repository == 'matplotlib/matplotlib' name: Analyze runs-on: ubuntu-latest permissions: diff --git a/.github/workflows/conflictcheck.yml b/.github/workflows/conflictcheck.yml index c426c4d6c399..f4a687cd28d7 100644 --- a/.github/workflows/conflictcheck.yml +++ b/.github/workflows/conflictcheck.yml @@ -11,6 +11,7 @@ on: jobs: main: + if: github.repository == 'matplotlib/matplotlib' runs-on: ubuntu-latest permissions: pull-requests: write From 76d8b3cfdd9247834f25f4c2aacd7f6dc863e5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Thu, 22 Jul 2021 16:26:04 +0300 Subject: [PATCH 23/47] Type-1 subsetting This reduces pdf file sizes when usetex is active, at the cost of some complexity in the code. We implement a charstring bytecode interpreter to keep track of subroutine calls in font programs. Give dviread.DviFont a fake filename attribute and a get_fontmap method for character tracking. In backend_pdf.py, refactor _get_subsetted_psname so it calls a method _get_subset_prefix, and reuse that to create tags for Type-1 fonts. Mark the methods static since they don't use anything from the instance. Recommend merging to main to give people time to test this, not to a 3.10 point release. Closes #127. Co-Authored-By: Elliott Sales de Andrade --- doc/users/next_whats_new/type1_subset.rst | 9 + lib/matplotlib/_type1font.py | 345 +++++++++++++++++- lib/matplotlib/backends/backend_pdf.py | 84 +++-- lib/matplotlib/dviread.py | 23 +- lib/matplotlib/dviread.pyi | 2 + .../font-bitstream-charter.pdf | Bin 0 -> 12990 bytes .../test_backend_pdf/font-dejavusans.pdf | Bin 0 -> 33413 bytes .../test_backend_pdf/font-heuristica.pdf | Bin 0 -> 56185 bytes lib/matplotlib/tests/test_backend_pdf.py | 52 ++- lib/matplotlib/tests/test_usetex.py | 64 ++++ 10 files changed, 536 insertions(+), 43 deletions(-) create mode 100644 doc/users/next_whats_new/type1_subset.rst create mode 100644 lib/matplotlib/tests/baseline_images/test_backend_pdf/font-bitstream-charter.pdf create mode 100644 lib/matplotlib/tests/baseline_images/test_backend_pdf/font-dejavusans.pdf create mode 100644 lib/matplotlib/tests/baseline_images/test_backend_pdf/font-heuristica.pdf diff --git a/doc/users/next_whats_new/type1_subset.rst b/doc/users/next_whats_new/type1_subset.rst new file mode 100644 index 000000000000..b0ab0a4337e6 --- /dev/null +++ b/doc/users/next_whats_new/type1_subset.rst @@ -0,0 +1,9 @@ +PDF files created with usetex now embed subsets of Type 1 fonts +--------------------------------------------------------------- + +When using the PDF backend with the usetex feature, +Matplotlib calls TeX to render the text and formulas in the figure. +The fonts that get used are usually "Type 1" fonts. +They used to be embedded in full +but are now limited to the glyphs that are actually used in the figure. +This reduces the size of the resulting PDF files. diff --git a/lib/matplotlib/_type1font.py b/lib/matplotlib/_type1font.py index 032b6a42ea63..e6b9148663ef 100644 --- a/lib/matplotlib/_type1font.py +++ b/lib/matplotlib/_type1font.py @@ -3,7 +3,7 @@ This version reads pfa and pfb files and splits them for embedding in pdf files. It also supports SlantFont and ExtendFont transformations, -similarly to pdfTeX and friends. There is no support yet for subsetting. +similarly to pdfTeX and friends. Usage:: @@ -11,6 +11,7 @@ clear_part, encrypted_part, finale = font.parts slanted_font = font.transform({'slant': 0.167}) extended_font = font.transform({'extend': 1.2}) + subset_font = font.subset([ord(c) for c in 'Hello World']) Sources: @@ -25,6 +26,7 @@ import binascii import functools +import itertools import logging import re import string @@ -637,8 +639,7 @@ def _parse_subrs(self, tokens, _data): return array, next(tokens).endpos() - @staticmethod - def _parse_charstrings(tokens, _data): + def _parse_charstrings(self, tokens, _data): count_token = next(tokens) if not count_token.is_number(): raise RuntimeError( @@ -660,7 +661,12 @@ def _parse_charstrings(tokens, _data): f"Token following /{glyphname} in CharStrings definition " f"must be a number, was {nbytes_token}" ) - next(tokens) # usually RD or |- + token = next(tokens) + if not token.is_keyword(self._abbr['RD']): + raise RuntimeError( + f"Token preceding charstring must be {self._abbr['RD']}, " + f"was {token}" + ) binary_token = tokens.send(1+nbytes_token.value()) charstrings[glyphname] = binary_token.value() @@ -691,8 +697,7 @@ def _parse_encoding(tokens, _data): continue encoding[index_token.value()] = name_token.value() - @staticmethod - def _parse_othersubrs(tokens, data): + def _parse_othersubrs(self, tokens, data): init_pos = None while True: token = next(tokens) @@ -700,7 +705,7 @@ def _parse_othersubrs(tokens, data): init_pos = token.pos if token.is_delim(): _expression(token, tokens, data) - elif token.is_keyword('def', 'ND', '|-'): + elif token.is_keyword('def', self._abbr['ND']): return data[init_pos:token.endpos()], token.endpos() def transform(self, effects): @@ -755,7 +760,7 @@ def transform(self, effects): fontmatrix = ( f"[{' '.join(_format_approx(x, 6) for x in array)}]" ) - replacements = ( + newparts = self._replace( [(x, f'/FontName/{fontname} def') for x in self._pos['FontName']] + [(x, f'/ItalicAngle {italicangle} def') @@ -765,11 +770,63 @@ def transform(self, effects): + [(x, '') for x in self._pos.get('UniqueID', [])] ) + return Type1Font(( + newparts[0], + self._encrypt(newparts[1], 'eexec'), + self.parts[2] + )) + + def with_encoding(self, encoding): + """ + Change the encoding of the font. + + Parameters + ---------- + encoding : dict + A dictionary mapping character codes to glyph names. + + Returns + ------- + `Type1Font` + """ + newparts = self._replace( + [(x, '') for x in self._pos.get('UniqueID', [])] + + [(self._pos['Encoding'][0], self._postscript_encoding(encoding))] + ) + return Type1Font(( + newparts[0], + self._encrypt(newparts[1], 'eexec'), + self.parts[2] + )) + + def _replace(self, replacements): + """ + Change the font according to `replacements` + + Parameters + ---------- + replacements : list of ((int, int), str) + Each element is ((pos0, pos1), replacement) where pos0 and + pos1 are indices to the original font data (parts[0] and the + decrypted part concatenated). The data in the interval + pos0:pos1 will be replaced by the replacement text. To + accommodate binary data, the replacement is taken to be in + Latin-1 encoding. + + The case where pos0 is inside parts[0] and pos1 inside + the decrypted part is not supported. + + Returns + ------- + (bytes, bytes) + The new parts[0] and decrypted part (which needs to be + encrypted in the transformed font). + """ data = bytearray(self.parts[0]) data.extend(self.decrypted) len0 = len(self.parts[0]) for (pos0, pos1), value in sorted(replacements, reverse=True): - data[pos0:pos1] = value.encode('ascii', 'replace') + data[pos0:pos1] = value.encode('latin-1') if pos0 < len(self.parts[0]): if pos1 >= len(self.parts[0]): raise RuntimeError( @@ -778,13 +835,275 @@ def transform(self, effects): ) len0 += len(value) - pos1 + pos0 - data = bytes(data) - return Type1Font(( - data[:len0], - self._encrypt(data[len0:], 'eexec'), + return bytes(data[:len0]), bytes(data[len0:]) + + def subset(self, characters, name_prefix): + """ + Return a new font that only defines the given characters. + + Parameters + ---------- + characters : sequence of bytes + The subset of characters to include. These are indices into the + font's encoding array. The encoding array of a Type-1 font can + only include 256 characters, but other glyphs may be accessed + via the seac operator. + name_prefix : str + Prefix to prepend to the font name. + + Returns + ------- + `Type1Font` + """ + characters = frozenset(characters) + if _log.isEnabledFor(logging.DEBUG): + _log.debug( + "Subsetting font %s to characters %s = %s", + self.prop['FontName'], + sorted(characters), + [self.prop['Encoding'].get(code) for code in sorted(characters)], + ) + encoding = {code: glyph + for code, glyph in self.prop['Encoding'].items() + if code in characters} + encoding[0] = '.notdef' + # todo and done include strings (glyph names) + todo = set(encoding.values()) + done = set() + seen_subrs = {0, 1, 2, 3} + while todo: + glyph = todo.pop() + called_glyphs, called_subrs = _CharstringSimulator(self).run(glyph) + todo.update(called_glyphs - done) + seen_subrs.update(called_subrs) + done.add(glyph) + + charstrings = self._subset_charstrings(done) + subrs = self._subset_subrs(seen_subrs) + newparts = self._replace( + [(x, f'/FontName /{name_prefix}{self.prop["FontName"]} def') + for x in self._pos['FontName']] + + [(self._pos['CharStrings'][0], charstrings), + (self._pos['Subrs'][0], subrs), + (self._pos['Encoding'][0], self._postscript_encoding(encoding)) + ] + [(x, '') for x in self._pos.get('UniqueID', [])] + ) + return type(self)(( + newparts[0], + self._encrypt(newparts[1], 'eexec'), self.parts[2] )) + @staticmethod + def _charstring_tokens(data): + """Parse a Type-1 charstring + + Yield opcode names and integer parameters. + """ + data = iter(data) + for byte in data: + if 32 <= byte <= 246: + yield byte - 139 + elif 247 <= byte <= 250: + byte2 = next(data) + yield (byte-247) * 256 + byte2 + 108 + elif 251 <= byte <= 254: + byte2 = next(data) + yield -(byte-251)*256 - byte2 - 108 + elif byte == 255: + bs = bytes(itertools.islice(data, 4)) + yield struct.unpack('>i', bs)[0] + elif byte == 12: + byte1 = next(data) + yield { + 0: 'dotsection', + 1: 'vstem3', + 2: 'hstem3', + 6: 'seac', + 7: 'sbw', + 12: 'div', + 16: 'callothersubr', + 17: 'pop', + 33: 'setcurrentpoint' + }[byte1] + else: + yield { + 1: 'hstem', + 3: 'vstem', + 4: 'vmoveto', + 5: 'rlineto', + 6: 'hlineto', + 7: 'vlineto', + 8: 'rrcurveto', + 9: 'closepath', + 10: 'callsubr', + 11: 'return', + 13: 'hsbw', + 14: 'endchar', + 21: 'rmoveto', + 22: 'hmoveto', + 30: 'vhcurveto', + 31: 'hvcurveto' + }[byte] + + def _postscript_encoding(self, encoding): + """Return a PostScript encoding array for the encoding.""" + return '\n'.join([ + '/Encoding 256 array\n0 1 255 { 1 index exch /.notdef put} for', + *( + f'dup {i} /{glyph} put' + for i, glyph in sorted(encoding.items()) + if glyph != '.notdef' + ), + 'readonly def\n', + ]) + + def _subset_charstrings(self, glyphs): + """Return a PostScript CharStrings array for the glyphs.""" + charstrings = self.prop['CharStrings'] + lenIV = self.prop.get('lenIV', 4) + ordered = sorted(glyphs) + encrypted = [ + self._encrypt(charstrings[glyph], 'charstring', lenIV).decode('latin-1') + for glyph in ordered + ] + RD, ND = self._abbr['RD'], self._abbr['ND'] + return '\n'.join([ + f'/CharStrings {len(ordered)} dict dup begin', + *( + f'/{glyph} {len(enc)} {RD} {enc} {ND}' + for glyph, enc in zip(ordered, encrypted) + ), + 'end\n', + ]) + + def _subset_subrs(self, indices): + """Return a PostScript Subrs array for the subroutines.""" + # we can't remove subroutines, we just replace unused ones with a stub + subrs = self.prop['Subrs'] + n_subrs = len(subrs) + lenIV = self.prop.get('lenIV', 4) + stub = self._encrypt(b'\x0b', 'charstring', lenIV).decode('latin-1') + encrypted = [ + self._encrypt(subrs[i], 'charstring', lenIV).decode('latin-1') + if i in indices + else stub + for i in range(n_subrs) + ] + RD, ND, NP = self._abbr['RD'], self._abbr['ND'], self._abbr['NP'] + return '\n'.join([ + f'/Subrs {n_subrs} array', + *( + f'dup {i} {len(enc)} {RD} {enc} {NP}' + for i, enc in enumerate(encrypted) + ), + ]) + + +class _CharstringSimulator: + __slots__ = ('font', 'buildchar_stack', 'postscript_stack', 'glyphs', 'subrs') + + def __init__(self, font): + self.font = font + self.buildchar_stack = [] + self.postscript_stack = [] + self.glyphs = set() + self.subrs = set() + + def run(self, glyph_or_subr): + """Run the charstring interpreter on a glyph or subroutine. + + This does not actually execute the code but simulates it to find out + which subroutines get called when executing the glyph or subroutine. + + Parameters + ---------- + glyph_or_subr : str or int + The name of the glyph or the index of the subroutine to simulate. + + Returns + ------- + glyphs : set[str] + The set of glyph names called by the glyph or subroutine. + subrs : set[int] + The set of subroutines called by the glyph or subroutine. + """ + if isinstance(glyph_or_subr, str): + program = self.font.prop['CharStrings'][glyph_or_subr] + self.glyphs.add(glyph_or_subr) + else: + program = self.font.prop['Subrs'][glyph_or_subr] + self.subrs.add(glyph_or_subr) + for opcode in self.font._charstring_tokens(program): + if opcode in ('return', 'endchar'): + return self.glyphs, self.subrs + self._step(opcode) + else: + font_name = self.font.prop.get('FontName', '(unknown)') + _log.info( + f"Glyph or subr {glyph_or_subr} in font {font_name} does not end " + "with return or endchar" + ) + return self.glyphs, self.subrs + + def _step(self, opcode): + """Run one step in the charstring interpreter.""" + match opcode: + case _ if isinstance(opcode, int): + self.buildchar_stack.append(opcode) + case ( + 'hsbw' | 'sbw' | 'closepath' | 'hlineto' | 'hmoveto' | 'hcurveto' | + 'hvcurveto' | 'rlineto' | 'rmoveto' | 'rrcurveto' | 'vhcurveto' | + 'vlineto' | 'vmoveto' | 'dotsection' | 'hstem' | 'hstem3' | + 'vstem' | 'vstem3' | 'setcurrentpoint' + ): + self.buildchar_stack.clear() + case 'seac': # Standard Encoding Accented Character + codes = self.buildchar_stack[3:5] + self.glyphs.update(_StandardEncoding[int(x)] for x in codes) + self.buildchar_stack.clear() + case 'div': + num1, num2 = self.buildchar_stack[-2:] + if num2 == 0: + _log.warning( + f"Division by zero in font {self.font.prop['FontName']}" + ) + self.buildchar_stack[-2:] = [0] + else: + self.buildchar_stack[-2:] = [num1/num2] + case 'callothersubr': + n, othersubr = self.buildchar_stack[-2:] + if not isinstance(n, int): + _log.warning( + f"callothersubr {othersubr} with non-integer argument " + f"count in font {self.font.prop['FontName']}" + ) + n = int(n) + args = self.buildchar_stack[-2-n:-2] + if othersubr == 3: + self.postscript_stack.append(args[0]) + else: + self.postscript_stack.extend(args[::-1]) + self.buildchar_stack[-2-n:] = [] + case 'callsubr': + subr = self.buildchar_stack.pop() + if not isinstance(subr, int): + _log.warning( + f"callsubr with non-integer argument {subr} in font " + f"{self.font.prop['FontName']}" + ) + subr = int(subr) + self.run(subr) + case 'pop': + if not self.postscript_stack: + _log.warning( + f"pop with empty stack in font {self.font.prop['FontName']}" + ) + self.postscript_stack.append(0) + self.buildchar_stack.append(self.postscript_stack.pop()) + case _: + raise RuntimeError(f'opcode {opcode}') + _StandardEncoding = { **{ord(letter): letter for letter in string.ascii_letters}, diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 073ca05bc172..f61be9b51e8c 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -808,7 +808,14 @@ def newTextnote(self, text, positionRect=[-100, -100, 0, 0]): } self.pageAnnotations.append(theNote) - def _get_subsetted_psname(self, ps_name, charmap): + @staticmethod + def _get_subset_prefix(charset): + """ + Get a prefix for a subsetted font name. + + The prefix is six uppercase letters followed by a plus sign; + see PDF reference section 5.5.3 Font Subsets. + """ def toStr(n, base): if n < base: return string.ascii_uppercase[n] @@ -818,11 +825,15 @@ def toStr(n, base): ) # encode to string using base 26 - hashed = hash(frozenset(charmap.keys())) % ((sys.maxsize + 1) * 2) + hashed = hash(charset) % ((sys.maxsize + 1) * 2) prefix = toStr(hashed, 26) # get first 6 characters from prefix - return prefix[:6] + "+" + ps_name + return prefix[:6] + "+" + + @staticmethod + def _get_subsetted_psname(ps_name, charmap): + return PdfFile._get_subset_prefix(frozenset(charmap.keys())) + ps_name def finalize(self): """Write out the various deferred objects and the pdf end matter.""" @@ -994,39 +1005,29 @@ def _embedTeXFont(self, fontinfo): _log.debug('Embedding TeX font %s - fontinfo=%s', fontinfo.dvifont.texname, fontinfo.__dict__) - # Widths - widthsObject = self.reserveObject('font widths') - tfm = fontinfo.dvifont._tfm - # 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)] - self.writeObject(widthsObject, widths) - # Font dictionary fontdictObject = self.reserveObject('font dictionary') fontdict = { 'Type': Name('Font'), 'Subtype': Name('Type1'), - 'FirstChar': 0, - 'LastChar': len(widths) - 1, - 'Widths': widthsObject, - } - - # Encoding (if needed) - if fontinfo.encodingfile is not None: - fontdict['Encoding'] = { - 'Type': Name('Encoding'), - 'Differences': [ - 0, *map(Name, dviread._parse_enc(fontinfo.encodingfile))], - } + } # We have a font file to embed - read it in and apply any effects t1font = _type1font.Type1Font(fontinfo.fontfile) + if fontinfo.encodingfile is not None: + t1font = t1font.with_encoding( + {i: c for i, c in enumerate(dviread._parse_enc(fontinfo.encodingfile))} + ) + if fontinfo.effects: t1font = t1font.transform(fontinfo.effects) + chars = frozenset(self._character_tracker.used[fontinfo.dvifont.fname]) + t1font = t1font.subset(chars, self._get_subset_prefix(chars)) fontdict['BaseFont'] = Name(t1font.prop['FontName']) - + encoding = t1font.prop['Encoding'] + fc = fontdict['FirstChar'] = min(encoding.keys(), default=0) + lc = fontdict['LastChar'] = max(encoding.keys(), default=255) + fontdict['Encoding'] = self._generate_encoding(encoding) # Font descriptors may be shared between differently encoded # Type-1 fonts, so only create a new descriptor if there is no # existing descriptor for this font. @@ -1038,9 +1039,32 @@ def _embedTeXFont(self, fontinfo): self._type1Descriptors[(fontinfo.fontfile, effects)] = fontdesc fontdict['FontDescriptor'] = fontdesc + # Use TeX Font Metrics file to get glyph widths (TeX uses its 12.20 fixed point + # representation and we want 1/1000 text space units) + tfm = fontinfo.dvifont._tfm + widths = [(1000 * metrics.tex_width) >> 20 + if (metrics := tfm.get_metrics(char)) else 0 + for char in range(fc, lc + 1)] + fontdict['Widths'] = widthsObject = self.reserveObject('glyph widths') + self.writeObject(widthsObject, widths) self.writeObject(fontdictObject, fontdict) return fontdictObject + + def _generate_encoding(self, encoding): + prev = -2 + result = [] + for code, name in sorted(encoding.items()): + if code != prev + 1: + result.append(code) + prev = code + result.append(Name(name)) + return { + 'Type': Name('Encoding'), + 'Differences': result + } + + @_api.delete_parameter("3.11", "fontfile") def createType1Descriptor(self, t1font, fontfile=None): # Create and write the font descriptor and the font file @@ -1077,6 +1101,14 @@ def createType1Descriptor(self, t1font, fontfile=None): if 0: flags |= 1 << 18 + encoding = t1font.prop['Encoding'] + charset = ''.join( + sorted( + f'/{c}' for c in encoding.values() + if c != '.notdef' + ) + ) + descriptor = { 'Type': Name('FontDescriptor'), 'FontName': Name(t1font.prop['FontName']), @@ -1090,6 +1122,7 @@ def createType1Descriptor(self, t1font, fontfile=None): 'FontFile': fontfileObject, 'FontFamily': t1font.prop['FamilyName'], 'StemV': 50, # TODO + 'CharSet': charset, # (see also revision 3874; but not all TeX distros have AFM files!) # 'FontWeight': a number where 400 = Regular, 700 = Bold } @@ -2267,6 +2300,7 @@ def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None): seq += [['font', pdfname, dvifont.size]] oldfont = dvifont seq += [['text', x1, y1, [bytes([glyph])], x1+width]] + self.file._character_tracker.track(dvifont, chr(glyph)) # Find consecutive text strings with constant y coordinate and # combine into a sequence of strings and kerns, or just one diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py index a588979f5fad..9e8b6a5facf5 100644 --- a/lib/matplotlib/dviread.py +++ b/lib/matplotlib/dviread.py @@ -17,17 +17,17 @@ ... """ -from collections import namedtuple import dataclasses import enum -from functools import cache, lru_cache, partial, wraps import logging import os -from pathlib import Path import re import struct import subprocess import sys +from collections import namedtuple +from functools import cache, lru_cache, partial, wraps +from pathlib import Path import numpy as np @@ -583,6 +583,9 @@ class DviFont: Attributes ---------- texname : bytes + fname : str + Compatibility shim so that DviFont can be used with + ``_backend_pdf_ps.CharacterTracker``; not a real filename. size : float Size of the font in Adobe points, converted from the slightly smaller TeX points. @@ -602,6 +605,18 @@ def __init__(self, scale, tfm, texname, vf): (1000 * self._tfm.width.get(char, 0)) >> 20 for char in range(max(self._tfm.width, default=-1) + 1)])) + @property + def fname(self): + """A fake filename""" + return self.texname.decode('latin-1') + + def _get_fontmap(self, string): + """Get the mapping from characters to the font that includes them. + + Each value maps to self; there is no fallback mechanism for DviFont. + """ + return {char: self for char in string} + def __eq__(self, other): return (type(self) is type(other) and self.texname == other.texname and self.size == other.size) @@ -1161,8 +1176,8 @@ def _fontfile(cls, suffix, texname): if __name__ == '__main__': - from argparse import ArgumentParser import itertools + from argparse import ArgumentParser import fontTools.agl diff --git a/lib/matplotlib/dviread.pyi b/lib/matplotlib/dviread.pyi index 41799c083218..12a9215b5308 100644 --- a/lib/matplotlib/dviread.pyi +++ b/lib/matplotlib/dviread.pyi @@ -66,6 +66,8 @@ class DviFont: def __ne__(self, other: object) -> bool: ... @property def widths(self) -> list[int]: ... + @property + def fname(self) -> str: ... class Vf(Dvi): def __init__(self, filename: str | os.PathLike) -> None: ... diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-bitstream-charter.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-bitstream-charter.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c8f9411fb3d9256e278e458f49cf0949f48714aa GIT binary patch literal 12990 zcma)j1yoh-)-E7QgCZd+u;~!kY`VK!Is_y(-Q6G((j_Sk(w%~ov~);!cZbqI1dpBdU);rgn?~G@zmoXU6rce+OqlYlCpi&ggf(q+VAs|MOwZ0iD4-W{e>}mrA zfra%P^en86L0|oG2a`2)#dfgpau>g_TNiU z7YA`A2R#QUh~>9JLC?VfYG(yvg)LFRN+x=SrdGxvwm(nptPPZ)4j?TctcVzp3e?2` z1eUY}QV{xc75;OT1Zn>x9mxMI0G2l_dpjtQ-S70licouNM>_+c9$5a0Ah0ad&{R*z z+69Qn2>h_Jvw>KcnLyg8U}2yrz|$VY`P)*^%E}s8L11S8Yy|A_-_FTEt&AN^K#)Jt z#7r%KT0vkj3!niaPy=g2C@f`r2Ro>qC8|rZe`L8_n*e$M#pE>((dfJ0Dd*XX&K!RU zLQ}SOIMb(j)A`t*`1299Z(B?eX!1UMJHDy8yQ14TIopwLYls%_-d60lZuBpbJx^Et=p-gO$zr%LlbeK*H zK<2LG`Z(wI?<6sTzJFu41vjnC$Y9qP3-- z)jcxC_8=D2dsCs`b3hMagMjFnnAt!O2q!a$lZ_deG_WM_HkcX+S{YkFfw*8ndjr^5 z!5)HPAz=%c4=^`+HWE-%V-p8pR2TtE^*<|C*aDUjFcnY`E?Ff%WWwcL%HwHUJxfjlf2xU?U5# z5isCjYbz+&-ayaJ+6wGoVh4qS9h|Mfj)taCJE*;>Jq_x=-{bp4{aj^jABj##aANGC%YkQBYDGhkn@0e;c~nvv9a{3$$MhXy;RS5e0(LQ z+P?N3ZCzWW2gnOv-^t091IO3FE|5kbQUS#Wdln^qYaas+89`tf8vy|u#JDZ?5{evY zFGLziZNTo+REmTHhj2{^Z_+kLxcHd;qt5(X8~*<4;)iQ{I5C{NTNd?uPiPedA9QZk0 zTVs0pz$5g8=vSN^+c;L-C`tQpzkIvlSLWy_?vkPYnv;w$0}kqJP5p8`Kx&blzO}cL zAo$n^^<^wM_P*iO6*+>aU%^X+V8qFW-+B*ZCS))o;=tMZ2xoXxd*Q=UiOh8leQt{pzP<_(;j;19J2%e^7n?-Qse4u(8lW-!9FugH6_mE>_{EnoFt)@~AO zka~&3+0@=;DGw?BY70LU(zrPa(#O8e1;2*>@itwt%>J^A2964G4VOIhGD`HU{Vc*B zQnCe_%>Dp&uPPCPzM#7n62m|3n$PqrMfbiNm|JLBGS0Ft0BWliXPb7SZ zq~JwwyB@@i-r zjk^tBxZ6Qbxa%3N!@F8F3b2}*?1vXU2MZ3z;g30JukPBOEw8U`U)@<)A>PD1%FW@P z#aO;va8n^iWL2wRMEda-&Irl>E7!O5>3!r} z{;M`5?8kRtdNUPE?Y9bu2q1*ZEWb?E#f3L_TR+n1e0nH@?Rt)R?qmez(&Q%ySyk`K zMglm#MS2tIBX|>EZ3ypyi{J(KR+W4b;hKHmkf9$guXhHP`5S0kE#~%;-(u$NJ%$%p zwD|yj2Nx`*p#E$zqMj=Q+XdB!PxLd!YG57NYhySfoo?f1_T9lD5-I~i8{7V<%i5{H7xivWgT+dCI2)w{W zbJR1qyhD6!@hy-y*~fu(Yd_T9b1)*dfGG55^Wwqd+kjRfI8ZAdf;j8BE|Z`j4m{%R zR}=3bFQk3whTpVY`#~3j)OB;OjKHC@_3G+u8p8F3KpyAfQ^XKB0gx@Dz#GKt-Gvvz z7CR3Ev+!02M=}G}bSLLgSmPBomGbD1T8qBY*P?bfcI<>WmnY9-Evh&ZTUNb?jAieG z>Am5bian2S#9wE2)ufQ_94ZZc-n{bU%73G4e+Ks#t=i#!V-{zQ;H__h;dz+Dok-<%Do-`%*0Tpt1UI z7LIXAP@ZJ5-1oyahO1+zDwqs|m-Yoal--921UmEGdaUKr)D=Z;G`=K!$62DvJ70+w zLt48oR}(GLcHaFWIMN-8Yvr&q(tpGtsyQHEI(xOTbftA`xSN1jj^krco>Uv1PbptY zByE2f)4AAL;S`D0sgJH7L9B&il#8VlU}66liP4W9?uv)zqOYKCpykJp-C%fioaV!? z&1a>37YR=z9c`gC-cv~{+hQxDwZHt!3ZE)fHc4Me^)!yob{8k3V`0M&v2<@#eD=Qj zWm4=O;nfYf82_wZWvuu`3+L*VuIVXZ;B8xATs!#%%M^qaTSZt)=}h0*_`6o=_OV4i zZht6JZO$_(yp$IC4-n0x>p4nXN_m!RRiY8c1ixb>sfW%vrt?M*(jq(q_+-m$=x2iI zr0^D>=+a>^4Onby#X}tYMmTytqA5TvlPb_en3HlXR)yZ1C{YEN>rItE^_mQyA~Zru@_GYB|iEl{>cNQPPG&Go|5R=P<@x^=s+(d^zBi?G7pj zNpIV;ob%6FQIE*ZFLEDdl0VYc=0mvU-rYD;rvMLl+K%X-J_?Ymlf8N0W8T!jU4-5u z#icK<`c|DrV>c~l)0~;S{_9+vqq#Yy9oU6HY9+0sGPDfTrMz8UO)i&gp7VX+qAkXP zNMjoX`$>HVZoE{|K0b|hcdxfcf%R}na*9)C=^Ae2ay*EM;$laV#dnp?woBg#t%X)z zS{YUAj)>=F-An9qP4U-s;ZSQ_mzeC_)T1hnZ{+8hR8^&C@#_hq@29sE&Zmu19-tS| zRxM7<$7wzIQWb--sN{aAgSPX;A&fQiYX|3SOXbNL*mX2;57}tTnKQJOs@6B2uw=b`(*LsUksU5K|kuW+X9T8%{2xdZZ^w z4-<-edqR82a;jWzh`YIt+PIxY)$d(ZOe zW`jP#&2aCBP?nDVx#3&4`KRx-tNS)~Z44QB*^St}y-E?H4Q?wd%RfBe{i;aaEG4qp z$0YiS$;VX?$1g>3!kVqb_@({}-*+b$hlL;OA6$KtBIz_g>dx1mu9DY)zusQyTyG<3 zCN-*R2xyiNxP+AljeSHa{bHNpq*q$BvaA_hS?7HCdNNnr#|oI2WDUDxubv zaHi7I)Lje3v24cinB>_}lT~R%?WBU4Ku3$de(dII-A&R1nmebb$adnr*X88F4$&LO zvJzZ2#)|#cEm?cK^G02o!(pKB^(5z@XJGY=p``8Qil{a+&+@xCj~nA;Z`7_K%w5rw zurOtOfwmiQoTnBpD%I7|+bR48X=xizlW^B$JH$Tko>atBEzGLd$}Dh)m8pkNXB{*f zqJ0I8aXi+Xt~qtnRVX6cmwpph`Ejj+|6+W}AnzA83d6?G+(g9L!!hlm4Ec*HqJg^> zI`$!AyPt|Y?ZWTeD%i>Vw^-IjTp^acKVsa)f04T}~5^~*jlZY?*Y=cAIfXfwVX z8%|S=a7u!f>kn8<`UeI1M)#3Od`Bj*>NGxAlp3KgZv@0?5~1n`AhW(<==p3$^yq?@ zl;V4Q#Ku0aDmPO@Tbm||sq&K;d4vHbOX9sqCUP*J8s;=d&8mbrskyCJ9V75@+-5Zyb0LK%evkKf~FA`BWLmqxCW9HGpy3600%dz$!Dtr~iD zT9@%`ac#OSB3SH1py;7s=%{cQHBC+=Xcg&!Q}QW&r_taVRb)!hvZW=bk=}h(=k>2^ zJ_Oe-3_~5*PCfWfP%4%|LEKy8J>BWQlBz6UmYd9s^A!zP5gM`7A14sc#b}*A!|TO# zd=?jRDJIq0Kvc(NMEpkDFh_8!T&Dck)6qdZLF>>x;mz&GK$)2HNDtY8$vlDXPAhKh zN%%|FhUd<>UI(6|MfxAlxk`q2ve?~PDoaqT82NC`BM5`G^{qhoug(J7=#Ou^mQNgx z5KkN1m^pW5s*2w)Q&i~__0z>a*X0NiPSj-Ii(_CCohSSWNqd<#=S#<4@5Ga;@QSA7 zynD-s`MHcjARUp*#4_2B`8h2Y?E1GAk8{Ir8@qZD51=)x%>jX#3qbu$a4-dqO% zDzr?m8y(gDV+(QcT72fsfD52`B7;;C9iS0LLsrM1RlpDO8MKlHei%yEqqd6?%gPG{_?d_6?!{jOg z0=hV(*$0m(Owp?)}+f7mBKMu4szo`j~#MqTQOO2)8@Ryc0NfG@PT>Z5X? zSK%3yE6I0~Fl_h9#f+wEjJTm&&a@PXP-_I-RY>nIzv{0=>E>E)@(AVg30Jb8OqdXO zoQg^e8|O|Z9A_Jp4UULDxcjlyAd~P?J=jl|3<+*?n$fU85LS(F%ygDUP$$xV*N)#` zcb!l{fzz5}q!qgUC`>AbV6H;bLnLIN5*+72F4o+;3h}Eyf9CY#njCK0S;P)gsqx1g zrN3*C#o>$N#z;-V-SjX1vAvAnwMMa!g1rY5KTXXqJJ-)lKJpx_Et)nztl?Kjj*xJ{ zH|v-)v54|_QTX)0<7Y|PKHB=r@vufN!er1!n0U(zlB6n9URpUXD3-{xZBMrNr}QsM zX-Ps0nFbUl-VjkfS$eQ8`csbG2{CzZoC6 zJh?D;66cB|s@06_D(tZ|=gIl=jMiq;^}~^NpA@C*mClk$$INGI-dy)q!${=?tS87| z(e*M7e5?LAmx2jMt;Hd2ruNX5k#e)+iG03>MLVwL?J-fex4jaZ%533sY`JHWVLwHs z-7l(ku`mx;q=%{0w_fZbTZ+LM(@|-wiv1~S{`?&ce$@}BiIsmGPz9iWmXH9uz#-48 zLt;gdSf?j6Zr;}IM26a=-Jxb1-|T|KUP|GQnDR%iSUoq#FS9G)G=w*b$?RdQe;I=K z(Mi#;-%Gs4U`pU5a=ozM@>2w#j5bqPrfASxiGA;91CxuVKh$fQ)q-AB$hK3MM|}On zhbFGYJFJ0T#x9~&=#o~3AkSej?uA*Jq{SIUM{K$&NiLn(8^Ze#iNl|&B6$-5f8NS` zS$3?IUuZ1o49ZftX1TXdZT>?j0+iqJi66rUjOO0?WdbvNK$Oggo0TurWwZUWoRwz% z<<|LWOkJsPRseVNqV5!t?sxz+yH?e$9l3r9Tdc+0e0u8Bj{yXZ=g7Zbw+wZM|C?h`71}yBqlX?;uZThIRaGUSkJ78#Xv=`e zYn|El{04Js+t<6EDZ{EZ%XkL;r-719uNtc>8J;s#)vpLEfuHieL<*RlJzSNsns4ga z*G)6NQk2hC_Fg{c&*|}{iPZj~N@X3ALHrPNBaR3$8+*cK!0;`xLPvo%YVW7G(E<^_ zum%>&cc$yE<{vZ;%plpsETnmdJy{r`^V;#(aBHv9<15*i5UI83*HVfmQtj9Dy~0^W zl59EYFO=(ggcrsM(MZBmY+Z@Nxw#as?N4w0%vvrrLpnN}aC%RIHl8Ye=*4p7|IqW2 zN_CtabKk+lq1iURDqF-^%*`>*ScB{Xo^~6m@pa?ocxj&Xa0u|fkys&4%+yJvnByf6 za^&W)koeR5cnqEot$mpZ#C%ya)d^LiX%G6Ij8xeTem*Kk-p0P9U5eTBq0egX?hP&M z>P*E^D^JT*@@F1-<>JzLkkkl%IFeN%(@@@e5^61^OI z;~3=+gBe#-<+o?iHqcUdoUvW@rOG3d)+f&8tWF(WD;7>2GLP-c9I100GQ9GyQ=4jR z*Kx|KGFN<9e2zl4KgDzOm+E$Oi1(J@diUDaSm!6)DS=gX+NJmIi1FGJuDQ%m527;^1={n)S z%lYbEj9KozQOTMDy!RNcYI)lHPM<9GJN2;EvkspJUBca*eistrU7z(DxE#;^c=%jV zh<+=-=Uc`sRTJZ=^!R&w(&pHF^2h5d!}X(jp{7Kn40q@_>>sUmvA*;Wu_&vY#LG`u>|&IoKLmu}$(_6WKP zPS>g#B36!e>*?!Y7gOoYWfxHmnoVm;{EUA-(qNo=DJP6g-ru{MRo2`}*wBL5ydbtu zw}R6P|7~=pzGLjCx8c=yX=+jrb-yj-xEvx)$>X@4ldt$uKTqjg2au1gQ}a!22G?{& zX~-lyTGG9qxacknb-fj9pz!e$4?QLz)Ud@fzs!nFI zviy{9X9wAI$c~Zvl4FHl|7%n@6;kxt_n_h{pSLs}e_3jykt_;l7HUFkPs6YBZ2qSn z=*8>m3nU+~ss-<`<7^O(pg~nj_~{<|_-Aw9uhU0X%vq!69Gv@~^01Ocm|4kjdg7s& zdGs@`2R2g<p$MGCdCn0W?+s`$P-U2XMcjvjnxMt^+hb1Jef51lc%_$BvRe7U(m{hF=K7+*H z?itEDAzC$Y=FH$D*))}3Yt*_Vh5U#yI|tuIC%K>U_J|*BaX#H9z=lJ`F?b`B46U`Y z^RRjMSj}@Wxeq0Lh(7n@DeLlz`L8Lwhm5Ny&~3!e7_J@YOHaHHR@}tn8?JHn<4)j6 zvwtEQdNCji#M~wEE*Rw{;mqBnx;g5{oYL*8WWI=D7Cgi{Os@2paIY|=Y~(zA^+?;YBg1@8MY=ge=zXE>^r z-Z#hgbQ_tKJBp4gaHu4eCnSX4g<@;JM$aN%$0~yNuRP8_6kp*b%8YU+7#y95y4Q(#_Uu5@Y6gN? zxQVS%tuSqCS;CIbCN8;MCnsd(EN;SMzkr|0;)T-hwFgbAQTG-N;ZLg>QNp8<`Q%+h zMas8pf?0(ou=nKhmm*jnPc@>4kyzK2`Sh8mk2|S;Dm_j3hOa7nhEjKdQi1fbdL#9D z#l`5Qe#`ApuH%H4wFrUKr(iT4yq5W|I6B2Et2)hO)7sV>4Pmx3EJm*tT=RD40`8<} z!)(kHDMII*J_U$W_N*yVGiOVG$Q>w}f#VD$VOW;;BX_5dqroB#>KM^}Kx0Ix%{)5M z?9FF*h9~sxQwEbZ8^eZ_IZdTyv0YgvOMooM*S>Gbz)ZQ<}7YdW$2|kXu-! z`K$Z{apojzkZ-*R&NzO|7|nV3d(B>T9#sL-ZE-nx!x>F`J|oIZbzbaYtX?D6He$#} zXAjmlsm0|Vi6Wy2E#(qqzgQ|Jc|Z1wo`EnQrvIFXjMBFd#@UTYar9Dv#`?pb}`G5V)I$*5;?=y@&O~7C}{LCmLhMg#98>Sv@qRXBC?A@ zZ;|}?xhcAF>t%TNn2H5N#`zc0j%}FJG;^_{MWgfyA6a5!hEu3-BO_lJ3}=pJbh?{k z62KL@VD;;LBA$;-Y{bLjd|qVNP5LxU)$AB**T^ z9qzV`&&(y5k5RD2;poPvj@Z89NM#?=Keee9yeZ<8W;W?K%;F;GNmK_f)0iUaH$?jIr&SVWmb?qEnXM{5$n zG|v!AY13(f7Qr-vYTogw^E18)5o1RyE7k)4Szx%nhk zzPlK^#SlKd#_m*ee!gqTc7j~%9j2y#@U|(RIEsc#688sbEp6Pjh~>&NgPZJxk-;J$(ea8tMHhWdq0&Pe20yAzmZqU{0`am1;y(hppohDO4V7 znLf?^OU^QWuUYVc)t5pUz&4iaB&h`UAjKk5ped@dC>WOMPpvZXCKxKnG74cR9LOMuX<{5Ab+f+4Vsx${#_zx#OrbKesxs?KcuYW;iQEoJWQ#miZ>@ zhaFC^@7IHKX}-@e?eKinnY{*qQUX28EuCuXpIr(w9ZhEjEeXCsR#AKtrgT-{nlV%A zWUNMX64M>V?jX%y-bBw&E*rb~702ZpCQfITa|$lM+gSoLYLL;p&o%P$o;PD@Ny%yr z7WS%BEY%yog7*4<{@}wFow{s&62QIOFB~-yCQ>mO{%}2e;G*o>SvPc8 z-N%yr6rr@pWAn4Cgt&ghvVVQ3SOFfF=P%{u@TxF#DI=XMoell!d2;j8gDd%A8##&> zxXMdj;Bv7AD;Ap2jxS^}44nd}!Lrq(63K=M@V}eIFk25yXNzOCXzXxlK%* zpN(STb^15=hpF2EUr^!?H$oc*C4O`<($-!aKPqdJ zs`7&zgDioewW4e-tJtdLd)7DTpj}>GYJ}r{nj9CiOhcaqNY|DfySj@%6RJ5{Dcukpt#-XvswGvX#ah z*dEITmUcq+FDfW_7FVvfI482k&wf6$-QBCh5hNtOe>^*q!huAuL`3$EA+{{EcQEEO$s5n*+B zPA8#)eX|0J^}E%6qVc*`S#110VqQawZ?v5n)5P2R53j~WOfSz2Fvg`fk8HGM{G2z7 z!}BCnG-C`xi5Op8>I)Z6P)E;|@_)EuR%+musZd?K<{CH=zUoDJ^vgiKjLtG{RmIJ| z-7y;1Go?u-_PpfaOCH%dbmwL-K<$zhN0ahb61HTaFFTCp%X-9c0&hQGuhXqyf-jle~SV6MQJBvdu^Ozz2i zrsbZKa5;I1;U+Y2nCTF+x%DZ<;Q&_)t6sjZ*TdX%xUy|JQW2v3v1h2oc0gMahqK7- zX{hd@BxtQaA=oQdbjwJxQ+{mH??o4>(~cmKA{r|LWW9!jKKNDJ=hGK9FOW58J$e-D zKH*wJcmNb~v4RTRRhHV^w63d0Vol?pg#sI4BkC$*r5~L2G@s za{xnH%S94-95&CmC33^_*`Cg5bZja00*A>{G#94E>Y*U{u_DU>lV?xw@MJmQJR4~u z4{zn^E6J>j`YICEKBI;8&+c`LTzAzjTOIDm%UB=2W&cbb#+QWXC(EaR!s4?jgpeGZ zRqVKE2mkU3UK#fLSb6;HHNjUsJy~mcM?+E@W&RuRPmt@V%lgh;&oI2jeeKo!2mPxj z6QkeQ?2MreIEIwMwK+oZO@o-8GF0LR)isQl>+@pG6h3DX~WG}KY}a?cXg9hUIc4aT@vVIuf3J<>lO&MsyvsPsI$d1 z3O735d?(@IJ%jWpNuEH8O-HNp0ICvYeUd5kf^)$ zb+U77U2B z4C=|QtF`5HHcD~|-fmkr-UiJ1B7qYnu^ny4l(Gku2VcIrT;TD+xr$a=cE8+-NLko` zxPQ6g=OJZL{a+}BFxJ{%j@!Sff&jbDQQzU7>6FC%jo^RXJtYKi&_B$PZ*c=-yGV%DpatDsgV&tzO#Z+PqkpaMy7yRfLJ&|FtQ#9 zM$iL(!MJ*W9-#1n*jNFUA&?Tl#04mZAWn7=SPul&2Z0ShU_*dg2-^b{!pZ{rL-YeN zF#&tsGXg-4^&nFD3~7`gagFM1l#v_Pwx8y_`-5#0j~GtP*_p0B3T)M z0)Zr0Sb!@V5R4Oo%FF}{1|$QlVU1)027(pBe&2Y2cnRp)?|oQVfdD|_%m5(FoIsI4 zfvjwtz#c&IK!aHsnNeZ)Fi>Cx!(zg&zu|&Ga-RXvMiyYE{*@NY3?>jJrr!-_0vf={ z$^0K6!aQKY%K66_#(0H!aRAA~l7TsK07=8bz&gNqkM$qCP}vy&VE4!C-V;^=tVb*W z@f0ZK9y34(d&Ue*_`MG3Kl9&N1X{+z!E!$j_cnl@1;Fy&AGn8M#qp=~dz@id|ChjQ zVA#Xh-+-Y0x!&Ur!~U!q)%fvHz1! zEeQGNA@(l{KUi20Z~`0Xfgms*J6MqE|7r#trhm--LDGkDp8p)f|2}8_9y7qH`EMm` zV*ZCEj8*@ir}*!$CV-_)4PmG1{dWKqVPtJ#Ye(P^zfbZnTl|0B(ZvpG1PnBU0~HwD zKOf-WWo2ds8G-(#gB^{q56J3|4#EU`nf_bH1e}uptz!nz{%;)%F!ldK$MnD0u>d*4 zKL3gf+yjTef9sfmsrzpo8|+)tzl^0e<4HC%E%h{!*IU< Y=E2?pVC>(+1Z)J*;3+6X<;76{58ap6h5!Hn literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-dejavusans.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-dejavusans.pdf new file mode 100644 index 0000000000000000000000000000000000000000..fd907dee6687a4fb28076f05a417096fd8a1fa30 GIT binary patch literal 33413 zcmagEV{m0r*EO1SY+EOGPHfw@ZL?z=9ouHdwmM12wrxA@$2t%C&s zsAyzi<^o{;>!1wa=Z7`3H~r_x`F|}Ccd&N_u>6k$P*cI!+RVfi!0{hb?7ORkimQ>U z8G!Xa1Bynju4c~m0JeW7EKtSL$kfW-0>J*?S!V|m6*E_W&fl=2;(wu-eRl-_rR@Gf z5dQB~{ck?H&GFO#j^eZzBFp|1Wd0X7(1YmH?*z zMiaNP{hKQQC~o_g08uj&2UD|ukX>Az&5Z0|zh{Rk@+k}o!f$@!#owgE>t1w@`^Lz@ zC2-HJBZC#&?ggAOg7Jn2p>D`w+0e7gOUu^($xD;%?whTc75tA0pDFG04FB5%TOz{|&Rj!(oyzsvr4 z+`m+T44G5~6MY^@Xk#J)_42L4#D?^rj{Zx;e--sVto>t>nT_>-RrWt@{~Oc!Tay3v z`=_M;W&A%{{U<TeHNnF!fi*qZ$f3KViN`6s4- zv#`K_0smS5v+8fVI7*sXSy=v^Wn}#8s`+1w?Vs@v&tEZ^0hs(#V&-h-V&wuf2ATj(f#y~~ z^S^=y+PhlWnwkL}{-0?Fdo!S`rL)=JZx08co4u8|Fe589?El-p|AXXzS^SS~|EA5( z_80AcEM@>R7wg}4_^hI+7f8nW#=3!ogbMAB6_77C&^TFwlLK2ThmlVMbQH?`gz>z9@`Q1s z(x@r|L5LF&Lvu*RdKVTKr$(l4={Omhf1)j~hY%E5ox#>XhGMg0vMsHwc1J}o2zYbo zCh2wCK)-yz6*Cn-S4T&`F+PDq>vV8-eyrNbz{NMP6hJ|*u7D(e8FPUp2Tlo6a^zEg z_Ktmc5Ips|s>W{E)?8dpfDVXbexarK7b7s%Gd8e5af8KV2Y|@%1O!*r$CkkKEo?1~ z&LJYk!2>{>z_>rhwjOFdKGfu#yeVCF46Im~n7^pOOG2Zg!8pKzSM$glds9zxCQmK{ z7~oa?D@n{PXp9|f;F?^V!h%hV!PB)f+dyIhkNk^q{>&*qx`KR52PqY7^f%-p#iEo! z3P2>~BPB%(xUHQQ$b0y+FuJfc_3PfDqbq?Pxeq{BT3tvkaS#0bq!iLz*#g^yzu96r?@ruUsfTdq$KhK$&nZAfv|AZ5K$?W>i9QRs&>0p|E z8O*jC4Fh^f9X&T#oE%_@qS(NBJ2os!LG0Ce0iXx_-DX@ z1Sdz&5>X1fAF=z7(B%x%^97Vfr7}=pg0PU{S?u^Tl&@xd%dw@q42XJ~O7+(x^N%Iw z!y|=T{*qU0u4Aol0psQY)6_a?*Id>7lVo^cdw2W-!nyKw%aEUQ+WT&T+{jYT(fpyJ zYR>*7u;|Qu7h>|^Qkwp^;#>ZH^j}?lU?2}KCNY6qQ(K4AxdOwkw-6s()sFs?tSpoP z{S$Y!EB=C*6d=J>IVEk3q~`)A)w&>%-aI=3w|O={`iD3FIDA=&F~FYi7roTW z`GaF<0mcaZ8N2d@zut=i6(Drr@G$b@L;z(ukFBV8Hjiz;ca}(p;!9LE#$Pw%4;u4V zN?Jk%`3%g7?dgX{`r{7`9xNF=m7U(9KP&ZL9A~{L*oad@i({t>Sbz2jU*-e92Fz3a z%|W0aKr;Jk=+?4sLNpgcU3nLwcRS_@WE&{_NCb7GwCOt!FGwnlK~v$&vvhrZBK9AU z9EnV6*!goi4KxLzM&n;2zzB1|RIkw+Ut|?=^l_Eker#v^tKT6T-Ux^{=VdPSstD@O z`e>?F^2Fa9*?O+x!%VUtdya;7KQP?>%nSX6=Jt?5Pm|{S6e^u4@Lr#;>=dPo-{k(CIe%YPyd+KJ6TyG}V1UR<2s)5c|*X{!TkyS=ukM z$tZ(~izIh07D7090slDxS#&AXSfTgPCnYy>gz*twDGMh`2F&+uV+>)a^upQ`J!jRn z#Kc}zVp>34;w%%(E?YG9^hO@pxN!tly4q76Z1Z`XF%btw2NU{@At66?`nss63 zj}HTUIth=_5SZ9}mIugN?H#cLLl=4To}ub4-zzTm=y%E}D4=83!!#~IY^&EVVML8u z=)+_?V5EjkJSUCWyo|0}2*w0a#ZZAU+BQDj1x12eIS zJN%X3jMCU`do_m|OKrHBPE|fn^45Z6%y6+A>$@V?^pDOqwIhEB4 z({YYu*%dW|9kFIGGj?V0_pUteWZgpq=YcesXZZ{!GKGJn^gk(frPyI{-W|(Ide>&3 z;1JW!6>v~?P^&~!sl3Wvyv_)YmonKigT%|{w&d`;dNZs9;bi_*9pOD!l2zNE2tyI?=@_0t*2;FNf{wWq=n~#w?CQdk7=wtcA^mkq{?s(bN#0sF z;D%oj>8ayEQah~XR`OR!j@RU3rS0VZ>`yUJ(8%R&Rfy}xyX_=kIZZX}9Jn`cj{4m! zE3ln-cTU$`a4;`c&PxlGwmY8*8~J zmgU2{eRx)nZFI0x`J4#Obl)=Zgy!9xUEhN3FXcW~8%(Y6kvdyx054kRewx`P^y=>M zb_Nm&@~;t7^GEVbQ$Xk9xf|~f-oOw~po1HFUTLYfo0}YGE9S(T01olpoTyR3>pl(7 zud0u%%zYW-xJ5M`I9p>wM?BPvLSW#k2I83E=wH3qh+sE(qV26mi z+~-o~T7RbGO;}5P21!58&*(>fw3Bj81jnk z$Q*xLiVTL0nMY0w?-|Hznp~c4FGO&oxc!0OO$FFHF8SPE@%SHe89NL4aKo*IW}K^vKwP5O2C%Va8-RQV1&|9k%?^25)u#&N3nC?Y;OZV zt00}OL3{61-zr?Rlds!BOnFJ$#%PRO^>6s5V%|j}8T{Jb6V6Ql{Z z@M(cgO-_yO@$>z_ZNZBs%77ubid{j=<)2mPk@hK8rZM{vWoT~IpHu>4v&9{D>g%Gq zJmPk_3ken|Aq3Gxy=IZ@FLA)gMo%2S0BK0gS7z0nDJ14TwLH`7=#)w%xWCNb=WKI_ zJ($Dw;aYAD`HB9v!QdXzL=Q%Jv@j%C;kD5OHj9K+Ke(MAE$R;@kc}jc%g-a>sIveKNfbGemQwT}=~V zDmQG#;x?M?J>m)#6!dus-$hX-aj5DOP*l7nxEE37bN z3AU8%GKy9G=Jc7N{b~Q;nzqu=%axp=s;Y7P`c6rMSn??)MgChOs^n_VZ`8=9onQO7 zkNt^L^Wt3f2>ANV!cgC%CHxYue4nzu*pc5sKZZ1)7(Jj`KQ1z&Jhrn@t|!ds4VArB(r1 zA~bI8`sSoOobMGk*yU5-9l>wr_@fAfuzyenXugx*3)T%p%FsR1&j7Q%B}Mq=n*?6!T}} z5~Nh}4$XJD%X#Fc)ve#mnR6g%}-?6%YGpXVXvXFwsupjHdTApllJw zXdnna4r8%>+tSsL<^7MZCEfc`CtMYAV&(%~;*CyTr0hoet{0!jKylAW89TDt-@kG$ zHRTY%S3s?-8HdoEvsGfq15&G0wKF(zNm-vdY2sQ^Sxd@JYiu9e8cq}!u%;mt*aXSS5?baJI3P8sOgmW&^MVg* z3dML0Y7iy5X*I!h4o=_y>cc6gT#~6qz5GPCa8{!P6p}r#`J&p2d2Ur=PrEh~U2V<5 zZ@s$|kWU$zLEIkzvGNka>Ysd^ueYxkwsYr-Y2b`98B<*MX??EWL zx!e^lp*ly@*Qe|=YGr3;n;F|w3a=nAmL>GW9~e}<(}pP*WIXqonixt@=dcr%P)Ur_ zq?M6ziOmT9)h0;MFKf(7`O-SLS)cg4zmpO2e{&@Br1|K7JqRYI@|28DTGtg1jT$r& zV|4Cvee?(7?a?vb*U2);-SS3c_y+o?E|?njRp9eb`6T1;bF!agbROLWp^;o`SDOQI zqc9$MD>iK22ET;l#`+oz!VP5JX`gInmVT_gj^!;K_2Nng4$Osbu`^?x(z|YpgRC6t zFrZcGa<4p8P8&eMaN0M4D6%7hlVA9W#jd-|JlNW$K& zAw%8bOws&ZheY09y7IPB)XloPrWynup|dD=dO*97TfneiYS8IWyL_Q!Y*AID@g)?( z7QCi*0*T9V>L3l#ldmKdMnH3X@t25RmT3_k*^q9fq`J>NC0+WjTmyZ?fLhLP-yVc4 zm?Ku757ab)-=9NB(mw7BR|+N5nYFf#UoiC5@ioLS0t57Z(S-w?A+m5nYB@9nFAr=g z=_jfAWJDXa?5E!QED?Sk8^VWr_hUs!z&84l2{DIJgMBNG$EugAc(g$3zi|9CQ$@h! zmgy#0q5ET7Z<71deJYGjh5huL!KIrEs`HsKiO)mBn|Y4FZDJRE-lRKwbNjj-<{abM z6k&PjSbhMiw?w=4VU6N=O7@*`8SL&93zKUYSx}W%H*3oZ!iS? zBNw#KnEmIhUv-r>ufTn(Pq7fWuF0Wd^e<6<@iOz5o@ul(ML9tQ!xrdH^lZ2KEZLPdPqKvex0OLItm3{#8G9qaHb{_nZ0Ycq|QMe1fb33{o;33-c-yvvqKj zc$=+hS+fljze&}-t5N3iL6N}kXlu{EY2SJ8!h4VCitET|eMl=MIycFP^(XE~u>VR< zR?2!8C!|gHPP2 zgakL)eL_y_4^gwE!w=WY{TT9Llr(}ovi`k3E+T~zd8n6Hb`Ca8oj~U2{U`vwbs`Sj zD5{ef(be0CV~~Sz_OH=>L!m@a-bn!atrm$<(`2Fl%rx-88yVRL)q=H{1Vb^m ztw04AKKx$dc+*oX03oOU1-;o_z0dR+pH1Z{P|SX}-;6&pkAqYymc~4SGW~}Dl4)Z z3nH>&{la9yjb^~y{qsxBV|nv|K^v<+g=j(~aw#J}L2&fw6T(A5I=7*-{-$OHv%)@B zCTGkD|0<a&mAtV3^;d4u(gRouXRbmG@ATlmZ3(Yr>|epa;7FH445>h6~A>Q`@AXM4}-Sf?(l zj|z9Oo*;?Lu3@ifRv6ZM*D&FAqI4n-ioKjA4|J^qbfJkZdJnjoL1#`pFaJNS-^zQl zi;&m2{tU>ib;XL_+g%pGt+AYv>n~E!vgW88ZjtY-=O|prKTFkKmU*bi`Dh}Fx;9(q z`*Q71C6Uott_@J3oi+ZT3^mhCj{cMAEsWr;&i$vj_i7kT^mzM`e1dZ)7A>bjiZp(% zoeN|fKWuGjZ3gyRH^8N^9Y`rH;=*KuJlPp((Ezs((T^jLjuZr>D43guJmg!daeK&yzj(bI4qvN6Q$TF z8ZTRvoAX4VguA>eObP!5BksqVy+L%5YUTYsHoxd^cSVfYte_P>?dpopC4j1KF+s4| z+$Tci-yMRP?nilE73cUY-C9L}{rNyt2^8N=mkGQKua2sZ*&yNu>6cTfVb5H`Z2KDL z;z(a31hE5+yhtpavQ22tgA1hzLsG43F9n23{MwmCdD2;W{vFEHrP{|Rs+hcJK@3Rx zWfC|=&>|Kxe)q9Z2`syn^{mo`_DgKG%aQZC&QYK*?90UEZCsP1S_JmYwqM8Z3CawZ1)Ca#A3<>9nJ6iR zr-V1^Dp7F(5ua>NN&4bDyK*FH{6OULc?T{npf(3qUGxmrkOb^^}r5>QKt+C*~n#UG{W}$g=L*Z$m4-F<)>*p{%vX^8B%7-9M&pRZ`Nb&;~*RN5XW|C&Z zQ`zulGl3+^Ug}X$(5nq-tvF0rIQs<@Dlb(E@%tjm7IIjZpva%Z8~yn-VLCbJ_fqV82To~*d%qgC8Y}HFkXJxZ)dVt^>2w#Wiph#> zKzLfo1s@)bYU^-1SX+gb)Kr3(R$sp0mK9bxB80`babbNpk}>najejARHbc6)V7RDp zd3qyMJs_)lBEvHMw1aXA#B__L`5BTFsy}Whux6hBJMR?_XWlgibK1$66ZE~nb|q=a z!qOJp2!<`GlqS*zA^)OPrDbw#Z8Kf5xR2NEb7()CPa|M->$_9G{Dv;3SUJ)};rP1`<$#89dVjc;wxmA`4t#VpR` z+w%c-&4oASzM-^AZLygu&49=a>_@qA0(KX=a^Td zNv>or7MdP?C+`m2xSsuJQnsZ#ee7mVUApD|$p>{t9W_~!Ohd{oIIFMjyV~Z@8KeSd z%1!1}Me)Fx_vIJ@$xWagAl!gOO&A_5IrF{n)^BQKfLZK?Tt3`*HNogTZ95{KPqWK@ zKCrT&%3M-Pmacx9H}Tvh3s7Xjbsr>2t;Rb`dtc5Dc0Ie!3k* z;mJ4=4MML64XXyr4|dAgG-%(G)lA&Z`{V~h7=8%66QiQoI+RgtUa0VNANx-xyps=E0at>> z{8UD$i~_|v-N@p)w9kC~79!LtnoPKt;JhMqyk%cv2S@&%FPBF&d)uiYt_P~3ARmvu z%fqsJ2&QRm#J)OGU=lamI%KQ`Q|}A4MQvAxS@P0Fk^|w9KGaaFAL)3W+>T1|@~lesQrhkK3L0xrApH~r67cg6?N~ocazNxU+sX-X)<^h5%QO)%yX^U!blipU z6~kv~>-d0S5q*6YxrlUJwSl(l+bn#;58#;H>T#IY;vdEhSP=GwsM+*NCR#3 z8h8fKR-hABqUa?F&mBltea`mt$0rhHvlFP%> zPKF3gi+e*yS2@EL7iK+?W>EceFkj{^L!)u9{0$|5J+sRh%?J<|cuBqR#%P>joK<|w zHIH_WH50=r7Ea`tGkAG zR7qvWLfCPfX)UX=2c2Ek-ML6vB6&TTAm?Mpi72Bs=g8G{-O+44(LLJihWh3 zopPo29WNCD726btS09RF;@;^Pv8Kh9uUgI=ShO*ULObljD&o$3A7zB8a!HLnD8#mV z3D;-xNuI7#v>Nb{7jH5J5i!I~yqBY&1KzI*0A)>ADbmufrl{4nr&^YnabXo#e`BTf|AA3LC*U zrDJ)*)OSvr&AU%SD@yO?%X1=A(z(5CC_HYYX%~83$*X}YsiJGLQfr7s!MFwBRxbjn zI(WC=7)0*L2i~r~Dj1RlopEf@Xo36$-roz!=EzgRk7%LeJ%dbe%tw%}XPn@?UeA58 ziD8z%fH<*U%*deuLlm37PEPQ3hu0X0r&%C-?eT6t)NvDmLYNg8R;SnLkW0Q*1zdwT z)}H{VIjnHq5HiI4-A@es@Ug<5iDNujuAV;$m~!b>^FEmYZ9ViSQzGZeXpTf zV{%87pt@~DNz^NAo}3@~_7h+3DNLX~0MrJWPZi&`^2OByF;xB_sckzlrP3sH`vS3b zLWj`&0lIc_I*2N&Bo_q(kLjrvwe%&KQuHpkdi8(J-`& z1oz`W^rYZ~`d1kbx2X$?0?jh6wdBO><)6X`ZBER7H`6>nGhpsz!K*KQ>kpol+tyvG zevtd~3FwP-x)X8Orhff5<@K8ULW|c!p_fb|Btq=a1eYnJlA{Dx}Qeg7ymf993swlD2Tx2DMdgkBs!&Y$L&h z5h--LapH#)biKz3M#T+>Gna$cvX7lsZ7(|YBn?oYnbWTtlI#zw_08vQ?<7`h7GtQU zn%iHb5wt8Fk8J2g3|esNf*rG1CQej}ho*v|M0ja@6hO_J)m+I(=S61?vDs*rC&`dQ zp=>{kN&ll_g83a96A#d6j2eEC_10#iJ_;)SUmGeNC46_Ak#Ew@O=NMBxIF8lzORwd z?wHbk1Bh%os_a*b(86WRvEN__|Ne6O4{;PsV5%lhU96D}V&$LqPnmH*#*-YHLm5B#)Z9-cU7It)*zwI*O0Bu~>%r$Z({5Jnk>7#wIj( zjS&M2GH~Z(e`LE|-u})MQ`LqTqbR4;cJrHG7WSwir%lX|%w~Rf2cyOpTJ4!<+Z@S4 zAcOXQ?G(%?U@ZL2yt5>PTRF zi-Ps0hu3S*c3d-GrQ=QK_OYgGdk31#l0!dJR<{{rltXYEaP*djpAgJlEG(+FdrT&< zbw-Nd38TiX%l({wjF3|=buZ2)U9UWsAxpi5bFw=jjiTz<_v8*}Gtzp3?XW0u*AGJ3 z(_h(AYT)ZZZ^4yI{x+<|wR(E|`??}$L(Z#|GOniX9E7Z9cLPcYJ^4phmv6JBXR1Nb zT%fbi-Fp#Df3U?ZM;y=V_e?nc3O%zH_Aq$#dzLB0#uZuL#R0N}Bo%P$iI7Vf(@RFF ztub}Ygit{qKvRr+fFfYMp-kzlDBdRu^rfhFwsktJngtLnL zU)Dh&7vSJx-&gr+WN~a=Nax|R1c`yVvZQ}?Ji&cH`)bSlZj9^1O_QqYVQ;2k+Gn;{ z$fhoRX`!;R(Uk;iGrs@EQrbK@UCQ-4G;eL@hR@>L!X|vyh#w7gX8PpoyPW-;k8H+q%R#7tU^hzuYF zXG;nXRzV42*5z9pIXrxV!CcG?zw<5c&G$~(<^;=?@9mbpdijzya`a)H=HD>Wak9=_ zPaCtPyQ0sMrG|T6YCK4Kr#-7CqHb%*?H}|2fCNEQ=^BKlV}m<%@W1m6T9AKycJab=wL_} ztkqnm_O6_q1-z4MU(fm4c(0w?23wslTFa zCc{Y$vHZzB|HRz5xr`s84g4VchFMO;x)7oEz;S|KRKQMpP0u9FRyX4aY{mw2z*{+r z(SumkGdI90m%~TF@Nr5L`FzV%e5AVleK0en<4?PbW+OJ8i=qmOX@JB!#t@8D2(wii z6#e7*oEctE3yFlElw11m{`g?Adf;g9P?%-Als~>p_ zd@1XhEUqnXsD#%<;ul59_-d`#;q;H0c_(NSi#@sV{o?FFR0%rCNlw`Y(1mwup~A1a z18&8Ha4_71Qw!|s%b=GlQT)ZCX%~4()yj?^?D=JZ?93iN@yT}23>yXsuR~O~GB$-q zWhdRZyojPMx)nFjblmDyf4=c|F77F0kJ6JU70VWel8P4{*y%un7mmQeQ!bSdrrhC* ztZslwm#)htI-(j0vF9zkzfxt8Gg`HuNV?xcx;ko|BH}$i2~VUn%*91r`WuKhgx=8T z;X~~!xfh%`om@rt=DqckS)MH3R132Dw@6f&T6_O}Ciyq>N(UVds%eP*_FJ>7n<>$L zV~S^LiKd_9zbdgEo&_(MqG^O=5q_lmRZ1eB)f2mF!*rNK^J^p^a7v9MvJC4|9KCZ| zLv(^;CRLGFMe(?u(*H68A1SQOtX8FUuFS{!!G0es}?~I&nr) zxjZIXwNh}1d34N3LLnKG(Bc8aArOhx*xtu7%gx!h5QV2s zotj2*&kIM5Gp0CuCC~xtpUk8YRUIz&wqhDd3+rl90ymnQKf}<9;2`6H1_ndemW@Mq z0tq4`Q?Q#IrcBpo=@ytpk@|IQp5X1tR4{0&uAJbjf5LVextK72x-nGE{SjOsRlRL0kQ5pU7YfkW( zRv@s%C(VxxwXp%-gJrEkIagOXR`@Py4+RJ}d4BGIRu}F!3(Y6FQkrrfn~MshLc~98ngDDqE5~7oK#S z51e;wto_AGNXFahARe@{6gbq5$hq{|!B$7J#Rx6`0$nVd6Lv@(521;4dAJlOhDaQ>$ojHGG+(Xtg?W843XbL!6R5ug`T$qsz=B5^r>JsGOIFwtzx3-8^ z<%G61?)bLL(yb~H-|n6x5MSCWd5GE?Gx^K-`C4T&VS_67P(0@}d1bY=%5jV8A}FSM ze_Tw+&jn3&P8X$A0kgz)+huoF&M}x{)}SzPtsyC@sIFl$-Y=fxE+T3q z**$>`SCD&L_dXI1(KYHYIx>l{gqq=Zd`@K}DrI?eLti z_V_joJtyaCPYMw_MGS{##KyA)T_(guKHHYKK?tULLQxJu;^&`c5&q|#Qa;55{+={8VXzJ6fN(+&B`a7>6 z#A=<>n;yVA2Te|XAM&C$(%D36dmrErCq{d_5So4;$~3~#Pbrz({Fcb)CK=s~z-|1i zg+pWh){Z?Ps-VXgY?23M(Jpb);~ZM)%#|UKMv>hM)dFq%r!v8z*80h}(R`1O!<{{J^kg$(PuFnBSN{~=(xg9ISSC+gFr6qoGJ7ZfR}0`UIgtN}rzME=aF=jIP$6*{L| z={&qSaOXXa@2&aBV17o8M_jNJZyFw&6U(rvw-3WKC8=<=+6OMXeejTU2?pDvNS+eJ5S61%B~a!nJM;K}K_3Uls_`1nJ&r-Mwf5j_~XlFUUn#3|?z z8Zr_Top@>T8!sBnN1h@PY?k5KZQ+MClv$_tX#qyp0!3j8s5FIRVzZKPRQ_U5*m+vn zYfF`!>EcW#7T|@xZ~?e%nvtQOIH%E#haFfQ6JA1VLpRF%J8+kmkOE8Uqc(PMKaf=U ziTm*w%THQ$CZSQ(u$5)qxr|E`WdCT7keKJX-w!7Iu9n=qfC-*|ys%*&{d4EgbS1va zHVogztutHGr3!>~5-{iDr<${1>UXb(8I6WJ)<}kLay2i&D)@)}Ae=!rpmtYSOcY^r=@*-K)XM7WUYsbB?=!59f~p zwv2N_WX!TFELCrKWDIjc-0iyK%;QX2`%^b%J%t4qDe26hj@V_ifowTtUb-VXWrZJ#e;*$k4JoIU35DznUTt~}=Jvt-pX zdXOAXeY3SqS=n>J{fB>b@*jtNoeFdF1g^_TwIOZuv<8myQn*jA9FEz%0b93gX)~4B7Vqw>t4F(J8H$va5*_OYBVeVFy{>kPCNhqV=qfNkAQM z%4f=_!@OJo{MtplI(kt?Fd2wlg7WJKUa#VyrlMNTz=R>*e~IAjR$RF-!*$$C-6|qQ zgU|XnyMXaWSX<70^s{UHitW=DDLOE@02shc{frqK3g}b$c+Flc!q~?;GZSNxI%PcS z(n#%7=kk}GBZU%R5tc+T{{`9ys&C+SK6xOY`Y@}i_%Z&gZoY_}A)dG^Gr*3SNgDen z13`&RPJrHSGgXIJ(`>rTEpj5%P~qT15G4r(7T(pUxlaFSPH|lt0i^wg*0HmJf7vz4 z)^e&mL-(3mtU(&0HO`pS)9H$qV0*d(@63IfTVS2^M!>0B-`!+oJVoPL`V=#%X4#}r zt%=->`px?me05$2JN4D`kOoymES1acYiZGAbw1vmD>QICWnj7TI&Ul$Q_96QRog~9 zJXXoVqoIZd^A%+7${nTmp{o&cp%#f4uIaolkAlK9PU%M(Dm8oFO!v9ukCz6X(m0x# zDKxhGkApaq<{1`tUUyIoNyR9&t?RC(DLWN=9;n8ZxC@?<*#SZqOpn`?7C|?a$en3D zhLoiZgOWuD+XZdUkGM6y2`>i>DB~zpX-|YQz_I?Wq1;=t}r+Q zcOQ9PzEmZ@=qC#$ZZSu%4QMS zvfUpWBzvR-t^I{UZ(Q>Yr#f$Pmt+`Ss<7I-QhvOKMq0sQ5J@=VQ5rEm1wUcBzNbm> zVC2lBRrzGec^j|H-M(VdWX!G(u}tto-yMeOd_F#s4()q=0|#@u=9ws-NWkm7QcuOW zZ>ZZ|J5sSUVX$;G+$Cx1Zd3}!pBV9CDn~jpvZH|#Nm2EC-M?sbYYgfEvHbGB@VdZ} zLeH>{gclmnEza(mVx*2x&B>reilbAbO%e>6zyKXQXYmu4(MV<5+E-O4Z%Sxx|9+nB z_m%o%%!BTer7$AtbOHuj)sJjA0Dr3?L_S8YFYA0V)eZ!aUW{|5p|r2R=|H|?n2FY{ zZJDC8uVcvQPY|j2{B^y$F44%c-PRQ;COK`rUgHR}L!WYKbN z!%7)4v0Od-VKDT@)tpG7QL#mM$-JUp48Kf>u*v7epoDm5g^w;NB1RHZ#5u-y;7lWQ>9K-nmV%6`} z=_d7t`Vry4kFod2^KX9JML)ENN@6dB8B3|&nk5N&vrK+>i%CiRrbC^n{k7cUnczz? zBfp}-@3hzGj)hR$9)`@o$4-X}2hEB+`8(biWpSqfU4DOp*1#6}Io;OEc_T(AH4W~> ztORzF-E2hj#2+N8D|)}O-~GwT>g*j1YV&NpKapORiq5N7j1sr+3weSA$s4dJf8*lL z*-aYW7~^#?XwYZXRG)+c7{q>3-#11#v~_6}uOov;Duq#kTVMaoVc2Pi&F{wc2o#uF zfyW=dc+T+vP{{|IPz2^znamT7X>trCla?pg?(X!c4d)*Z)Hdu zB?$LLEC8b~qvaomqfmzl)B-gg8`h@=aDJPAri~0Z4d{QvB3AS%Rh=x;ej`5B>e1vM zTy}8bVx;O1!c333*c#!PHPOW(D@qA5+esGpAx&h2aiS&4)y8^&QdOp`kVuQ90c3Iu zt3M^@>Be%QNbz4A+9y$~lp>=b?3xtZ<}q8>%5HNU?-NN#IB;E8J7((v8JzNtgkDtg z(kpL1;Vc;uHNwLoXDnl`$%jP7zJnj|=9Lga4i|NbI(C^nSmd;H%iB1VO86n*k;J~_ zw0Amlef=)yV9bT-R(`87coR~3XBq;LD`9xZkftC@IM6kj*VX)Hk*!eHP# zBfr8r*y6r*hi;_*n$Nyi9mptTZBBYTvMriFjTL;69VFZq%>GNH+^7CB6#!QP|ctb9QatPCFS&RXwFmZUEW}UKPjEvS)=ehcB^wD!40Ag4$%B~9Zfun%|&XjMvhp> zi(-;kWQMN1LwsOkG~bm78n1h!_;G`g)|U~<#{uK`<+GyT#bD;l%Q$MC3u>I`SJuZ) z^jx=}0;aerzkXF2=I~1(UupPIA!Xg`Igv6>g(%$O+chNicMpl&P%pjFs%73exV&@` zPrQK3S#z+uL{Q|+NY)^@M5jN!9~H+W!)&nxMX>{GR@Y~!m5(>yU#t*d2}_(-5~b2H zZt><8Gt(gKL4yu4O|{><6;awU%Ss)`2FS$NS4Kx#mg_3Bs^EW>vOSH^S%QOhLZ3b> zh`=-e_=T16>a930Xg9bi7B*j?b;elw*%z(b(HvEMf`-g5RG7qvLe^#dYS8LZzONZ_ z<04*7s%nq#u??ZhE2NKLatkm>iN;ectHysIM*KY(2KCDkTTvbp1TDhQCC8}Zk?($J z8;h{$qFxD3!a?q{?}rOl_K2!#!WuB7a_(yoYUvpm-PcBm=)G zw$)qI>F@=r0*IDfbkGj73^=R@BAH3Alb<`Q)b*V_M(! z{Sa+d+qyAu`AgG~IS;gW%OBI>6owxw90&%vrN5uXB2+R&;(k36j5STy_Ce>9 zdlP3tF&fyGcR~%3Le@|}UDr0VqirNt=Psvwd5Bw7b>jQl7YbZaI+kq!f~&j%HLehyMV1pQWB9yF}(A%+Z+zqM4;T-wj0b^xH3qGME(E*;35v)Ra%RN;){JFD^JVQ64d&6(yNGzb`Q)o^l zcXEt2HaKRkrJEZ^MyU=9VsJv>>MZu&JoZ5J6`h|Mzl+3fNfIUk#i*zHb?)nvK&vv~ zrU!>BX%x~20X{^;1?WYa+%mteVa4UW>7FvTn_`0d#!cw;PPj7P>%EW;B79-)T#T3{ zi)u2u&-q-ttJqImR_;zDG&Jm#*fvA2T&nqnT}#_?(AY5{tpkA`x<`ga)0bWypR8{+ zRT{+M-*BHe+OLjA#Zf+x0`OqVbNm|$` z+RF908Kqlsk1Z=)r2L8Jm&%OuGYA%H-#pz4b9hq`cfQp*!e2vWtvRvm%t`rEb-!Q} zcTiTSMyr<@X%R|GC?Ywrc9ZpS3`%n|%P9IhI^@qj>UmHFo>$NJ;e%9m zG^#z3;JkW}IWv2Uo*esm)+KO8@ux(IHbbAC6TUYuvY>35{G`?1dx-EpxzPfjkw|gj z;%ax9m*%h)Pggi`b`ngoHbt4yl{1?b zOiJR5g2}EMEl89u|8saD?1dVE*uDTLNL|mn=%K(24I8Gg^ciT=44YZLx7#c)jSPB}W4$Y6z|5#Bsvxrp|!vqRkbsvlTO= zMEJtZ*z2ac#~Z*p2w5o`G&>EiTVbv;k2b~?WWIE+lF&XH(oEP=%ThrV#Gr`05Nzm1 z`6$F72Ge&8bf3~h$K4gob{b*)M9esRH<NCsSHt~k3$rP!M5FJQmWiCN z^Yy8)@nMSQoY(4-gOV)f#}Y0xjegvII1WTYVJndVzoE<#NT33vZJdJCSr&Tc?5kkw z6;*dIC+r;Us(SJ8Y?}9tzxS32zr~45plo(Rz8Kn`bz3`pVUlh+@XFAlq$=V*7t7Mm z0m2U77HeqF+K_|WVnHCci|4L|^CH6=^&~@#EY7C!eps!@tpgfSz-o#DjW~dl&&XTcs8}lGZ(4H>c~4RrBcK55x#}QHuBI=`+ivYHE^x*h>2@eK{5~l+BP? zK}fGASPykL5sNH?22K=vT&I6%Id6UlhErLnyK7RaPe6Q-`ll ztq;;7Y1HuJHe;)s?Sak4s^SvACt;TI%VQ+rc(HEw9#Sx1jo{^g(mEuxaUhJ_4z)d>U4V9sRM;n|<(feda4+1q2f3ci@M8Tc@ z629n8Rt!PO4J**g_5GEzhpCEwoDPT))+>KLkZs+jRqb<*g{3^+;S20)AhMqI;d-Rr z^G$aLkpy~mlKxk8W)qnJs2aRH95%71+qZcOeF&ZAPOei{&<4qB+dFU}J0KU*vI0;9 zi5`VWw>`!r!O4se$|Cb4ot zM>*ZR$|7tkrSn7^1F6{w+)y#nzirQ-2R*eZh(#cGfqaYE$>qb8HARrN4rOGE@~a+U zEA_6-7fM7X^qIAR@rCD4)G12IW6`jJlYg|TYO(#IBQ-l3*UgcyIz7=~7J~&6ev20s zl=e0+kmWJZpk8+1>p2)Tg~`r59A}rM;9>+Uv)xJwSdQ(M*&5ZN&=;Z8kr+DPD@@5P zWwOo+soJGt%eI6su>^^ z(+TfvQ&)(<+?Fv4+f{GdpUT0Rq-3j~PX=4ohX?G?4@{7W>KRao}#<@IAonAcSJNklvg;1z-qa_Mr`$tnY zaYyv^bl=o(t_CE{6N8UWEvgWx`jk7XJWsDCIpJFMOHy`_Ngx6Q73pS?^|QR1)snPle%cD+qCmt_Nbq%NFg%`r&;(5WtU4+Bu5He z8IgNv&=IRCRP68`kG`6DRFWl$1*#T))cfEo#`yKk)f%HG`7bi!bpF)MtZ|Aw7KK;u z_IT!lC0|05HLoji!g{d59%aFlQp?}nk`W43FJE!T?}7CcKhIT%vXulk&RLvcj*l_! zZ7%+T$g?&6p?YD1YZ}NGlE~Oa9Nk<54_t+ONNEgY;ADqsS*xC}C zJ_^fNe;t~t^yTDy0K0MjmnL<@X1?gOqK`okQCrO<#+xQI%+QJlJX76FUbmTGA`+vC zA79a3K1zpdZ%Iqw<#^6uvk4{vpcaCio4TD8A#T$_2=1+w+(T`O+NE8+aHMMMOYx(kI1pQY++FE zd(>?Rl-Y06Y=gcViq&;Wu?9Qr!qObon<+R7g5@P(sGFC@KI4OqDQ)BM-*C{ z8XUe(E4%80=kO|t^zciCN{Nyb7cX1o7@3S{h9>QwRo(i0_=|;DHfZAVMBoOvZ02si zahWGP2XgRSWSlIZilDwiH4)rC)mqs1OtX~gtuQq=QlnJ^7BCa?Z(=?WHiDn@eg<|A ztEV{8XuElejQY}>_$)EKb`%z9U`(I1zHe!eR#)4^H`b<2>H4}d$X)m>7b{O+{8cAC z$MwtslSp@qtX}(6qgx>k7)1Q((~l!x>Y3UGUl*Ji-2vp?Ze@OET6tlKlr+M zzyu%EG;C75v3%}*H5p5Qp^J%|@J`uKU6j=kUAVmaX83Hu+*;FKxv+`yVzM>NI=O2j z4sBHMO;`3Vu*7rNI|2P+)&{gLf=H2|e{yXg~G&-bCXaF$MsxcB3E%3|D z#@nOB&FPT;C)b*^=FQJ7CszU03`p;dSg_Ezyr_(?K4?DepKvG#8b#f`gh4WkAt5;6 z@en~~eNC5uf*6TOcE%BYjQaaAbcu_xq(`2=tXEBagM21XEp)3%)1bep^V^#(n$n~{ z!=tnvz$d4-FHM$c>z}YJYaMCfXg}DZjZ~I&K+PPA`KIin=@@H>Ig%ne9;>CVl^>h# zWACzNs(Hx*_~xwapdg)Wx07_=Frjbq!kk5>NAsLh`RvhA%_EP1O2d{DmW-rPy73%B zGZAm6$!k3=^FS?@J4H&ScJ{OsBuwGwO;#S<=8JWi+4VfTYyceoV$I5#-mC2Ht*5NO zHDyU##)7<9Fw1RBgOR3^h*S9&ds0awYcs$mj z>v$DP@_OMXUvbWQ4pdaNrIXzqC7C;;&my_cr49rko-}e%}SLcgYqpo z9jO>S-*eSD=0LBT1CMfbL;cv*^j)XU=w=&M0@6^9!e&?0#4x1unt-2Lv8BNJV3f$y zn*xzhSE`NLmMv@ubs)1qsY(@xV9>D*RQ8jR-Cmk#@14T9{)EIXdc1T7BmqLO(IUe; z5b^KTncE6_?9E&^@mt4Q z_(<@r=i!VXa%dhFho6X(mg@x3=drAw1s5#fWNW2*;1L~W(tQs5tsgeF1L9Fu!C%-; zzenKFTUb0DL_I_Eig9vgjkiB(uMO(vYF@HZs6`#>TL&HPsD0nCd-_6p@F*u=M0YbV zH%>!lt~z~{P62MW=&GNu(k&L90`e*8Kyi$6cX*1=@eSwvrZOpI+#n97fRbk_P;W<% zx_Ev(|3udhSA2{wp!S*kw;?=h_X_(7Ogw>NO9M905F|!z#^Ge7khul9IcFt_Ipv(@ zKsTz|{*cBb?1Mn}a>YT1x=Z^SubQ4fLeFE*U?Q2HAV&g$piA6L9bX4Kdp{=p(ZnlK zMk2F!I9PR2hUQ~3UD(AFPWPFq*f^pP(NA`Na1nN5mt}qLqUO=w-NCKsq~~Io9vLw* z%EZ`Jcz)~I{1kOd)d|Mu&k6GBg_>DHjoVFGler=4UW6IP+GMx=(G)iC!Q=YnF(`Xc z)-?C5MJ|&C2!U;lET_I3Jc$~fD)yv6 zz4G2CGd?@6I7e@s=Dn@Rg(0~d#k(o-wdU7UpYVVs=-{MO61WQGGQo$MzCEJ)?UVA} z`Ron_9duM1^*xdZ$^O0&7+yQ9GFFt^1!*ccYnznmWnewN(8*>*G>(S}(z0YQwr%x+ zQy)K#0Ow;w1pGNVK8N8M0ZEZPQO!oHSf7HK3k5g(7vl~7o< z8!sR3X&3sk?(FW<14A0ysk>eia1oHf?x7^?fY2xsKmr8|A`z-Jp_ZM!fbK0$3x1Z)P(T zN%1U`DDn+mzfFF!tt(IJy5Yi{N{!bU@7KiWYrc(WvstXBG%fA2jlL`yFDy~#OA&{k zyv%(jvXR(Q3>Q3&C;yIHR7eV2V{F7FDrZ~`whW3oWXOGDky5s(8-|27Q4OJpP6+zO zGv5~j6Ac4uO&p?0(aIpk{yjV2N^p^rd`HeDT1hp-<-ZRL2* zBvh_X=HU|^$#JnXmQ}z#&VF#p72m!wQ-4;d6AeP(F)8NR8gw$a{w|w(nKZkfnOmMo zkTwb>zCT`E#I3=P_}~~D{j3Ys6kGI?ZLn2lI8r)Bob-YST1e<$p-IkIpqy^h^ctQ} z*XRWZ@LBjICvqF9oZb7C+j<&3 z{fu7LwALenZ{InQ$pVdz_O`IHu%5(0eZBV$viqmd2-?FO#=PgEs{VA+; z#gL=|Iglo|cry;GP5LSQ7dDTl|p2uh-`^o3b>*D8a;r*B;VIUk=Tu z4>5<_AFyh(6Nq&({kZ}f-Gfy(CBjlxNfTSmNeRVx`qsRaZlMC5 zd;0rEnPwsd1LvxTPLLf=?@0QmTT1%-aMHd}Xk@~1YdfRF!o+;qL5u6|c+nMb3vooh zv`VQW#jV&b<^J~Q+uFP7;be#)OfRTjGhWT*;E}?Ls)=9cZXc{@x&%%DW985)Z?D){ z;P}lfK#kDMNqDdHM`zJd1BT;Tf;d8gw?QrNxsftQKE5w2#z`8uSf8K2CD5e0_P{yD zJP!Zt-4s|I83=PTb$c0m>b;fmjOqB0IgncyMA2v?`qe6vH+6!sOvkJP555_m(hb3B zv-$PR6yT1DwAhV5bK-m-s3iDXM+Hy+gs*70vc5sWt_NbLNl7r>6NirE7NrY z;leQ}?qMkV6xO0UsjA%w`1%OiQR%<=n#rGoA%Am+|43IKA7CyykyQ1mkVQWHxnY^_ zG3c@$;AP^ELl|bK+*ZCoSF^L=9YR=NDvIqCPnwWAA07wa{q4Izhi7H94`D%7qa7;hpb`X~ zFf$af9}(;)99LumuPVoWhzl*cV{>lk6WERrRKyxTB9PV1U}OE~LxtFh^JZZA=ul zr6xP;w3tPsFW&9&nNYLgJXPm!=OQ8|Rgj8s|d(~TqsWq{{OBI|ro zQ{yF-DE9S?-tr8pYGwlal<ZF^veV&ej z+;kjfu!cOl+0n%Y6RE+$NntR>85zXm)w$GWGmpd1iv9d{-0{Kpi>QZ44}nf50RoL( z0wVDI3YzkrwV;Yx5F^e}wtY=WCa3{-;4s6$t%+#hK5Twlk8AZ1(${FVU!m5c>EmOm zfGjr|md}g@FjRTYytW^BzB``h%ca@9{6Ic)(8E}S^S>w%tr|O~8jW5hJo0he^n;T3L3Iui4~>TON@~vrJ8FD-vY)wzRNn~C%TWO49zuYZ^AvE95Q#>c6rEtKHOi= z6N6)?)*=A&migr8`rWfjImIyqYcskIV0zacgkK=MFmS!=IBg%*J>Bs{8rY>fF*{FGpDT0DXo00Y1>At z=9aN^*U2skvtui9M_?f0FpvQ@C`F_WO$#n7N<)8~k9Dxf?_{E74+Jwalvw%f5JcJ0 zTkrT@XXj+66m9CzmjDds0aC@S*AizClEv$v?gF_fnk0JRq+4G}IG>DB*?xW5Atdtp zl?b1A$#gp%LmW7@FxEepc8CB6U$fpsio-HS#xK27Vq-gs0fyOY3L&DsGo++ZtfU>4 ziCY6)okW4{o%tQyrHT{R|P#abMaTL4o@Fg4qtGKb{y1Nh3Sss zJpS;sbx?+H<*o`HM$ohj`dNLT&=@LHl}#w=;_v!vXgpwg*=tngdh5n30R>W-!$2Xj zesA*Tgu>RLfd92tC!B%D)rwjGD|l&8IkL+)wdmHn`BFWW0t-u)#LYLC18^XTn)-fT z8O9V=%Y=#KqNNc3q`H}Mw8niD;R}d&>vl2DY>gLLu4^;6>r5e)g@45s_zEL^Ko!=# zh{@@ewo*zp=^R}b4Pnbiz_?tyJ>VAVI|BUpK$LmAYSM&y=yu(k3*|1r2y{4dhOD%a zPemQ|vvXvHV@Y8n5ACh2qBdW|UMU4(Ii1^3_|6ysEExo<4UaZDn_hj+d;>0UR&XjN z4B|Tr+7tKntSfrhfrtx;gdkkQo`9NtYo^GyIya9gP&EUm;J^T|uuN1GG1&WQn%(M6 z_V!s6hlDm-uQY}NW)+Vr2V{g_?OXqE;C*ZXMpzCV^N{e6AC((Y>q3dCLV8dL6~d$> z0a~A|j}KF-WSW07&rnkk_PnWH;0*mNG)i2mKCpG-2pAB(2{oyf5ShoiYb~ow%)}gh z;1G(9b}`y(hzkBZ@T>67$5%XHr18{`58RQ;uuxU)beYs(F*$KU`UdI;1E1TCk!k5W zrCu)ZXa_~X`A8fY5F*bSD)|G6=anhd?cG8s#_sy_hQSwO5>zoLrp2dE0qH0kZHiy9JxlUp>aWDP31xN@I^ugP$|w8345wXKTGWEd<)EfEsye<>YzM z`FfY4l>xo@_chKu950cRXfa_EBwR6%uBG2N=~U=BSjUDqn&<>%1l9`ku?QJB!OA7x zH`%Vj%2}fZBNUdJmUU)|*{nACRY-zl+_|D^>b&px0e2|D$%XhgDxTCUP(X1>XFi>GhNte%J!-+PRkUxdbS7?gY^_B6i-24 z;D8-LirGPhTtXe5zLu}Yadn{3gJ^nVUu9iDbQI>nECf*F)S_}6NQt4Jh>>MSRKz#} zbLV%Om&}4(4-e?-rj(*>!ue^T1t3w!BbDU?EwRWFbAf!n5QkaTYRO-oGYYd}N+)CG zzXsi z+-}T4-U6E_n4Z@1`0Ha^Dm1DEwxj2aI`qjCBwnd7$nXamVH{pJMY5G8$ieGlfLPnEVXwcksEN zs-|nxVjf2N=3_&1*BNV$XGO4H-KDyclQ!SdRzstve|EGK8akZ!vF7QZc-uJ3I%fW$ z%?DJpfb8f{c^*7v1x6W&6{OG|9G+{Xm?2f_h;)W`OP3aq{V}2jou*C@0wl`t5`mx7 zT2EYtDBPyH1yTBN)66YjF!W#1r5w*!Jt>%(>J|(#%QJ%4Mx?k*MKn2|YP=S*iVrtC zbfA1cp|K%{U`YJNyO*&C>N|VsxKZoFc;rfy8mm3tSl&**l*BG8U&EW8XUzvXxR38M%Tr9gFCoKRqw9b1vXS9k$L>>J5j{wnuURW{*EW!cf&ca`he-ih$TFw;YAxH4~z(seoF>Umb( zKqEUGRXYN{E$E4Xj54*>A%AQuan$~?Du%}!h$47s+Z#Htbq0NIwKHCn!9ZX(C=;C+ zYY&EU_Fc~1?MCZJ#V^#4l{J^vWfU#SX^_X;i6{EOC(1{>yicn%ZBn&q_;`KksZY_cN z!E@0=n_I9&9XMIKW!xQ~(hY%HTXBSjMN#Xd6($9OnSY^_^0hnPdj;A?zpkDxqLkHg zu9$#(uAXwMmSb1v#SKu>1E$>k1xJp)G%O^@{Q?@s71FNlQs!OD+^EwDECtr5-RSrR zWjeOnd5C?$v09rJr2VhK-q&R!$7LBRXjp*ll*967|E0qO~FAt-gll zYVH`;CF3_acgR2o%pdjY@i5X>Z6I?geJ2E5Y~O#?XDHwwg%O5q&mmk&ELs=I;9^N9 zQFXCxlRwIWTUV8(Ynllj@r@O8NYg_4?WN#iD3k$>a~q^DXW>@s4lV6V=#ULY-f&cs z)s%!+phz0|y_zM~y3nhJU?e;aXmuELp9D>KUnh^aZMWUANHtfq_w!x^@*y)HNe;MO z6Xqs7fqhMw!%ru2aiEQvtBzq_K5Td7+MBQ%Eo^dSOTG>n)r+~4RrRejg^xIfE~|fB zv>-s#)mk@LnY>|7K6m%x`fmRKwh6t>SGt>$gRn$iq}o(p6F~;V*(5m`K``4XS(R6` zf2_$0Q(2F+1$=SigLevfck7mjb&r8rXCvmSGshQ(-=|Bboa{8QUr;W7gt3>uK;R*Lk_)Cg$g>O%&R`Ebm|pc@c`AjgJF%PTc} zPL$px(9A?o0y(_G95U+;x&N;66*3hksLsC4Chv#m@=rxoh>Obd7(Q=IxkkP(fgw^R|EWC1uRz(yJsq(>MsF@Oq?F2iFExZ z{2DH}Ez5%Sr7REd42yo~o+aUfN%_vOrBdSGL2s<}ad=Ns%mYv}@gL~#{Srm@43M72 zx3lFer0>FVz8d*R&sjKk=Wu7#JcGIJ71fqrQWewm7jUznkB#+OJbGS!cAWY#+DQr% zr9MCV`6M~xO;MH|7IX14Uc_7ks5b>0>zlx%_4{Oq8V%DL;kQm00Qh1&Smdu;4Fv zlb=_ix$FVU?SPjJeTh%j6`PssGuQ)B$$q`RXM*@}#=|tFDIYDylAm|xap)Rt2v1Je z9muc9S_rO-?dZED4N-b-nj;u|(*G){*>!l_YeVbK$o_@j5XNFebS+%L5E|(ase*m( zE55F7h4Co0HDNnn*lJi_=uNg$-os}Jgg%jxNGe>m<<@YmmL8MHc#|#$(97(jcwXbc z$a6cuee`|Ij7aK9`c*{)3@F2l<^0{-(HI?w1I5bSP-Rf+$8NFsEELY$jV!W2^DPlj z3|g;}!iX=f3t>~`TQ^T!p9w|qJ6`Wy@5q@hp;WoqDGzg<`caOYf8Q7|gvno&6cCN^ zsC8g*m89iA-!~GS8rxFZ*64~QyQ^#y5%Y4k03Nhop_R%4MTrw2}_>%l|mLjmTaE>gT7j-#of18gs*+xGK zJyfQm6xl1q6B2xKy03{I)(+PIB2r-kbzgEBQW|ry5UDsV>1=bTT}2Xa{F!iJUB%5nalos)-KvYX>{7?<;$ zFwxo&l){Raw9t5XN`mq7P8zv#Itb{_L{s&#Uh=|%kZD@Orn7fH!Hm36mj3BO zb{gV+#h;uQ7&bxbuM38WE+>sCW3rXJ!TE#C7j5~OW7&~p?D34*?r%E^Ny*vFdMH-F z9N87zVeP}FT19qdglP_0vjXX03%$ke-JlDx4%8LD&4hF(oM8x!5^03*mUu0U|DX%3_+ylRa4j8F$xd=!m!4M@d zUh0a?JnQ>6L~wT_+_&wYFXlkHTzsjxK&NC*Z}VI;hd(Ji7aErSx$V55?cq->ZDrdV zNPc02blsLE|3l0^m0fx(#@3U~|9w6*J>@62Lq=5Eac%5`#?>^!beR5B)c6VVxM<&x zjd&s={S%2dx$Dby95k*VBOc%!U<&<(knu+Msm!iGx0Y~{P>z~&Ao?F)L{;deu1l|v zQt%FkI|M3x3sfBP9Q0f@si0XwE>InAG{hVPeog5MYqbu3W87xgEF6E{L;w}IOYTc% zo9c8oEL86)-7kK-C?nQdN@9O=ynd#cAAd)-Ajd4sX(7#a{xbR_L_=%hJpoF*S~D^G zeK)B;h|d=${5mIbb)H4*z%TZ5yP>)@Ps{v9f5frFm#l#1%i#SKIV5H3XELVZG#D2M z*O=KmUXd005`Q$eUG011kVUG(AJq}HO@=!Zz~D4mHl$DJ3L5cm()B*pPp@>v`??$% zHiJjP$CcXNCMIhet46%EF~SH-xXJ5|iuKxyMLLi9C5e@}{M~7e8FJQZMdNtA0p4pf zg3obI1VAFD2(}8-(2{lJEH|xhyZEDFuaU9}s$dAG6gwv;gf=bi?#Sqm!Xr8qd?@>$ zP9jhhFB7lSr7Rmcl|pimPFciK!P$GHMtJ#){1sS%hh~K`M7W=HxE{lr=e=|kkZ^?5 z4CG;|s^bnCtfaiHQO}X{8NJmmE6{UCb#49MfQ$>DsBY$>JeRQq5w{#su&FXO&$+Jd zpCaBfHcDk<)4o?3r(H}x+r?*r2Xg7vwbN(fcQLz)= z4(8+YgY4W@g7OdOpWSk(S*0TBiMN(8lguTOGy0`w`wi8=8$>PrB0@Qqk#;5y4e0xJ ze$aTqB`Kz68ZEFnj+yW~-n+l)XkO_v6DG>7H1-h|O3<$aLNu|ur4Ea!=bGh(A_??Z z9P3};oV~A~*uK$U6xiAro7?~%I&PkH@WZl-+{CN&aJnntN@eGYbUDii*pDH>y#>US zGy1k^_dZt}O=!$Bm?R*?WO6aTITg#=tteh}hGD(sJ68i;mrKRNah9EOxpX#^|E>GUK&M>xk_+hjl#-Zg4WA> zKOeO^AG=*%Hpjb&&)5i3G9dNZW~SdCqHke|-Ktv!Ro6I+DU}Xc-)VrooHpAC-|lwW zuJ?eGh9b2K${|JZv&xTfm}4NW)#gx$=OQ1g_88(lKjBS_DtNaIHCb0(sPIasN5aR%- zo6w{ei$65j?zE2kj9kRAxa@i4m?6I!3-TBOnoJ*xmw>vs-}kLF4%bsHPXM1#jlh+= z7l+6nM4l9k=<(|lF>rUs4dmv^fWh#7dNl-r2OV-Mr^zvMTw(=iqdK*KddIpQ(+rMO z{7q#15g2F*4jf%V9ygB`I6ihVlV|RUe&_Bi24=~K9j_BsuncF!9V~lH$fP_C-aK=q7*@8f?54troz1nz2dS?Lg2lTz7CTj)A9G=Gzm5O zr-6MDjIwIo6ffQ&Ri}lH3Usth}ziS{npD4S?j;-xeUI9~^mk@liY2Zf< zUfT&=BA$_T8hC&4bLU5!aiS)!EtahH@SUK!SZ>-Hp*dc1Bk80P5%;uXmZpJJ?r_<; zokR7Kaq$2JQfg}Z5`kyO)H)RwAHpSv(F8T@eYr^E#+L-+h&6i^+K{)yaK%~}HeaP( z+y8*^kR@Pm5`M2<@VsMw;AdnsQNWM_Y?FFL6+MFsb{RY;nd(#+*<7m-Ap%!bdYYRz zP?TPZKR(%SV%WUQW9S3Vn4BlA7?UyYF~uapA22 zC?6!gr=4u`jcGNFjjq+ro}xHzQ;F3a5_I8HSOxi|5%+7{9>Zn|dKT4r87@y{QgYDI z%JTYvwgc!?)y*$G(URSIt$iGQ!PlGS->1V(&X^C(pH;0cW}ay;iV0byCWZt(~If#qtBXO$nE6bL;5V}pQccyJEA|)wzA8S-0_{326`$9)Aa|F zA(**vhH{W-<_M6J|HS-;bJQH`0aVqWAa6}YeQG?d49Fg}w2 zI!2w4@i{m@z=j`9s?W-%3nxXZYx`Y(`)CTkbkka_1xm>?V5z@U(GlLX)anv`F=KVP zg=753W_?B`Y3A1>xCaOE*lDxaWtMM6Z6wU8i1yM$j)fNlXD+%;KZ))AJE)WuDG9*& z!BpFKCV0>^y7=r}k|FEK5~NDvWJRwAq=3hQCyXa^YMO5#z4dre%U^Us;9rML<#5c9 zPmX`hu*2Ain?^eI=*0a5hoC)Iu8jE-_P{65%who<9=2rg#;%ZMnYB0HdHC~zSk3mZ zIS)mCYS%Joe{$X2QeMwp#ANi_uV=Z*!y(Ee6GGr+yB0};tJeJAzWI8;^?!27w!yX! z(l1BT6DOwXWp@^I?jI+7U!NU2=%@O!47*L%wR_UZ)a7>iMKIx{)%pfB5}H0ivZ|j} zgh8k=K>yG#J#SSg+iD-d653MG+jC-WKK_1=^{|c_k`xOmWl*WvYzS!1tHD8SN|Hwu zZb7H?gA$vzFBw>G_N+^a_8HlWDTZTjvC+q}d(Yo7155w33)J zw-Fa-jpK%LRxNkt?S<9i-dW-%u6(I4m9XzyFa^bat?$;Y{`kbxGYYJHEv-K`*Xu|J z{?tIMwCN|P7StNDRe3hVA^I&S@rrMD{*B#-ua5YNiYSTFNAmEnfO+_EJAndw@pPFpC%^lx0rkc>pmDYRM@s|Wz)2YK4(uYdvSEs? z5-mIxw1EVMS5BqL3?A?z^V=bmnR|rQXNxp0vedK(0l?Gqmb<_XbkRMa6*X zC=?B0o@aPiYG~;yIFOBsh16dD6!t3uX6q;K<*DLMXC5lZ4@VuHx>im%SLjV?jXCP> zR5K27Z{W{hj9uA7wSJw{&Bd1qOxP66P)N$na(w6uAlOZ2EH%e4 zCDbj#o~v5j#-#G)#^)xi{=zB#G0z2syM$i?)cI7CC>y~$Ux~U&*Bd9QjZ^R9S+dq2 zhHZ8*eC_wQC8zeB(|;w{-sG1<@R~FnSko~2R8@qEAkFzW>TZW+6GsMQ(ejL_GZ)-2 zNB?5EjikNn3=yAXO^1bG>-I!nzz=TTGOpo>TtU;dUJ=y)p--42b+f4aOr)`fVv{yE z9@X@WJpxA4Z)@5YZi3s5hDgh2NO=LdwW~P}yvY0wqm`Cg}{URR#u| z7sy8*D0)_R?iHpEtpL`O^cdZPN?jD_-zwk?*#dqBrG7E+ibru7So?qAhChh5{{V3R z2O|t1@H*)`{vlw0I2iy4VLb<<4_@#84HGuAcX0e5_2M(KL(@s={jW z4*>Ry&&mQI5d*FU!05)O6T;_U!>7~3r_;x$Gk~Tu#Ao~%>pz@ed`4!#n1A7c0owqa z?|&G<0HQJg2mFUkEc8F@WQM;v-702=j-~+I^mOrf zV#a3%;EtJD>G9c_*zj4I0Db^an2n7Cpo|TliG%)+eISuPUjO4`rHB600{VXR|Nmo5 zfPNqLF~&c}!bA`K2fWP6&Wz8>&VtX%!45bvJzziv0M(lXu+5Cm#=`IcHU49)EG+me zEPw%68S&Ye0e#s47fcV>W@m$D1@!q4!wSGpvjL9(7?XpY{jYHWzK`+$i21k>fT)j) z_z?9WgcX3X{y3HeFn@p+niT+AW@7ov$I8Tn&&bC1$5;SC`Pk+FT-S%66+kfmbIy+- z0=8KgKZ5mf91}hZ2LnDk0~_>5`^OkRj`=GHAMKxD0)qaRcED=@?fM`_TTO`5)aM+W*%7PYnLV;cxAK;tPlY3p+pq2SDS8UV#2T+5!4MwEwLi z-~-IXhXMM0=w$-T1>?sYeQ5s20D3<(0}T2@_doWb|DPEA69*Q6_Wu}Q4nGnOF!_M7 z0Lk-b?g3-})k6QX|0l*DG5MIw|FVB_;h*+Tj{KbqANlZK21qVej=vlq!Tc}#2oNj% z$Gheq`TuS?06_6S;rJ^Qe^TNjB>$wsKkZ*B@OLVFq{DyNf9U7`UA062#O{y%|Hje( zHyoXx;lE3dtD~rbBLGAXC>#8MgXj$O@EJaE^mP1;|DW9ewd3z@A3gsDuzxVj|1O;W z60KNYA51>l2FtOkp$JpzkO_g zD)(<6JD|?~FCQTB|CbL?g#OJpVJEqrDygXKxSv@yVuO<_-Yc13q-*ZEQYf n>tpih#I22O@c+!#pX79K)U$W|Gfhm49BfR`BqYKzBGCU2z>|li literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-heuristica.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-heuristica.pdf new file mode 100644 index 0000000000000000000000000000000000000000..ca9b38d09b894232f1d1fe040974ac6b73169595 GIT binary patch literal 56185 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 AHUIzs literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py index dc349e8dfa35..f126fb543e78 100644 --- a/lib/matplotlib/tests/test_backend_pdf.py +++ b/lib/matplotlib/tests/test_backend_pdf.py @@ -16,7 +16,7 @@ from matplotlib.backends._backend_pdf_ps import get_glyphs_subset, font_as_file from matplotlib.backends.backend_pdf import PdfPages from matplotlib.patches import Rectangle -from matplotlib.testing import _gen_multi_font_text +from matplotlib.testing import _gen_multi_font_text, _has_tex_package from matplotlib.testing.decorators import check_figures_equal, image_comparison from matplotlib.testing._markers import needs_usetex @@ -428,3 +428,53 @@ def test_truetype_conversion(recwarn): font=Path(__file__).parent / "data/mpltest.ttf", fontsize=80) ax.set_xticks([]) ax.set_yticks([]) + + +@pytest.mark.skipif(not _has_tex_package("heuristica"), + reason="LaTeX lacks heuristica package") +@image_comparison(["font-heuristica.pdf"]) +def test_font_heuristica(): + # Heuristica uses the callothersubr operator for some glyphs + mpl.rcParams['text.latex.preamble'] = '\n'.join(( + r'\usepackage{heuristica}', + r'\usepackage[T1]{fontenc}', + r'\usepackage[utf8]{inputenc}' + )) + fig, ax = plt.subplots() + ax.text(0.1, 0.1, r"BHTem fi ffl 1234", usetex=True, fontsize=50) + ax.set_xticks([]) + ax.set_yticks([]) + + +@pytest.mark.skipif(not _has_tex_package("DejaVuSans"), + reason="LaTeX lacks DejaVuSans package") +@image_comparison(["font-dejavusans.pdf"]) +def test_font_dejavusans(): + # DejaVuSans uses the seac operator to compose characters with diacritics + mpl.rcParams['text.latex.preamble'] = '\n'.join(( + r'\usepackage{DejaVuSans}', + r'\usepackage[T1]{fontenc}', + r'\usepackage[utf8]{inputenc}' + )) + + fig, ax = plt.subplots() + ax.text(0.1, 0.1, r"\textsf{ñäö ABCDabcd}", usetex=True, fontsize=50) + ax.text(0.1, 0.3, r"\textsf{fi ffl 1234}", usetex=True, fontsize=50) + ax.set_xticks([]) + ax.set_yticks([]) + + +@pytest.mark.skipif(not _has_tex_package("charter"), + reason="LaTeX lacks charter package") +@image_comparison(["font-bitstream-charter.pdf"]) +def test_font_bitstream_charter(): + mpl.rcParams['text.latex.preamble'] = '\n'.join(( + r'\usepackage{charter}', + r'\usepackage[T1]{fontenc}', + r'\usepackage[utf8]{inputenc}' + )) + fig, ax = plt.subplots() + ax.text(0.1, 0.1, r"åüš ABCDabcd", usetex=True, fontsize=50) + ax.text(0.1, 0.3, r"fi ffl 1234", usetex=True, fontsize=50) + ax.set_xticks([]) + ax.set_yticks([]) diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py index 0b6d6d5e5535..e76b9d28297f 100644 --- a/lib/matplotlib/tests/test_usetex.py +++ b/lib/matplotlib/tests/test_usetex.py @@ -1,3 +1,4 @@ +import re from tempfile import TemporaryFile import numpy as np @@ -156,6 +157,69 @@ def test_missing_psfont(fmt, monkeypatch): fig.savefig(tmpfile, format=fmt) +def test_pdf_type1_font_subsetting(): + """Test that fonts in PDF output are properly subsetted""" + pikepdf = pytest.importorskip("pikepdf") + + mpl.rcParams["text.usetex"] = True + mpl.rcParams["text.latex.preamble"] = r"\usepackage{amssymb}" + fig, ax = plt.subplots() + ax.text(0.2, 0.7, r"$\int_{-\infty}^{\aleph}\sqrt{\alpha\beta\gamma}\mathrm{d}x$") + ax.text(0.2, 0.5, r"$\mathfrak{x}\circledcirc\mathfrak{y}\in\mathbb{R}$") + + with TemporaryFile() as tmpfile: + fig.savefig(tmpfile, format="pdf") + tmpfile.seek(0) + pdf = pikepdf.Pdf.open(tmpfile) + + length = {} + page = pdf.pages[0] + for font_name, font in page.Resources.Font.items(): + assert font.Subtype == "/Type1", ( + f"Font {font_name}={font} is not a Type 1 font" + ) + + # Subsetted font names have a 6-character tag followed by a '+' + base_font = str(font["/BaseFont"]).removeprefix("/") + assert re.match(r"^[A-Z]{6}\+", base_font), ( + f"Font {font_name}={base_font} lacks a subset indicator tag" + ) + assert "/FontFile" in font.FontDescriptor, ( + f"Type 1 font {font_name}={base_font} is not embedded" + ) + _, original_name = base_font.split("+", 1) + length[original_name] = len(bytes(font["/FontDescriptor"]["/FontFile"])) + + print("Embedded font stream lengths:", length) + # We should have several fonts, each much smaller than the original. + # I get under 10kB on my system for each font, but allow 15kB in case + # of differences in the font files. + assert { + 'CMEX10', + 'CMMI12', + 'CMR12', + 'CMSY10', + 'CMSY8', + 'EUFM10', + 'MSAM10', + 'MSBM10', + }.issubset(length), "Missing expected fonts in the PDF" + for font_name, length in length.items(): + assert length < 15_000, ( + f"Font {font_name}={length} is larger than expected" + ) + + # For comparison, lengths without subsetting on my system: + # 'CMEX10': 29686 + # 'CMMI12': 36176 + # 'CMR12': 32157 + # 'CMSY10': 32004 + # 'CMSY8': 32061 + # 'EUFM10': 20546 + # 'MSAM10': 31199 + # 'MSBM10': 34129 + + try: _old_gs_version = mpl._get_executable_info('gs').version < parse_version('9.55') except mpl.ExecutableNotFoundError: From 22198e9de2285d76bec1a3013011568076947f8a Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Thu, 15 May 2025 16:44:48 -0400 Subject: [PATCH 24/47] DOC: tweak wording in docstring Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/tests/test_usetex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py index e76b9d28297f..95eb69325622 100644 --- a/lib/matplotlib/tests/test_usetex.py +++ b/lib/matplotlib/tests/test_usetex.py @@ -158,7 +158,7 @@ def test_missing_psfont(fmt, monkeypatch): def test_pdf_type1_font_subsetting(): - """Test that fonts in PDF output are properly subsetted""" + """Test that fonts in PDF output are properly subset.""" pikepdf = pytest.importorskip("pikepdf") mpl.rcParams["text.usetex"] = True From 53355cae4f15bd672cc9829719f6a7c68fb5a8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Fri, 30 May 2025 13:43:13 +0300 Subject: [PATCH 25/47] Simplify match expression Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/_type1font.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/_type1font.py b/lib/matplotlib/_type1font.py index e6b9148663ef..33b22adbae73 100644 --- a/lib/matplotlib/_type1font.py +++ b/lib/matplotlib/_type1font.py @@ -1049,7 +1049,7 @@ def run(self, glyph_or_subr): def _step(self, opcode): """Run one step in the charstring interpreter.""" match opcode: - case _ if isinstance(opcode, int): + case int(): self.buildchar_stack.append(opcode) case ( 'hsbw' | 'sbw' | 'closepath' | 'hlineto' | 'hmoveto' | 'hcurveto' | From c77a459690da733028a60dce5f0991db3bc5701f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sat, 31 May 2025 07:56:54 +0300 Subject: [PATCH 26/47] Use one font descriptor for each Type-1 font The old optimization where the same font file and descriptor could be shared by multiple differently-encoded fonts is wrong in the presence of subsetting, unless we also take the exact glyph subset into account. It is very unlikely for the exact same subset to be used by different encodings, so just remove the optimization. Rearrange _embedTeXFont in neater blocks. --- lib/matplotlib/backends/backend_pdf.py | 32 +++++++++----------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index f61be9b51e8c..c729b27b1b53 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -722,8 +722,6 @@ def __init__(self, filename, metadata=None): self._internal_font_seq = (Name(f'F{i}') for i in itertools.count(1)) self._fontNames = {} # maps filenames to internal font names self._dviFontInfo = {} # maps dvi font names to embedding information - # differently encoded Type-1 fonts may share the same descriptor - self._type1Descriptors = {} self._character_tracker = _backend_pdf_ps.CharacterTracker() self.alphaStates = {} # maps alpha values to graphics state objects @@ -767,8 +765,6 @@ def __init__(self, filename, metadata=None): fontNames = _api.deprecated("3.11")(property(lambda self: self._fontNames)) dviFontInfo = _api.deprecated("3.11")(property(lambda self: self._dviFontInfo)) - type1Descriptors = _api.deprecated("3.11")( - property(lambda self: self._type1Descriptors)) def newPage(self, width, height): self.endStream() @@ -1005,48 +1001,42 @@ def _embedTeXFont(self, fontinfo): _log.debug('Embedding TeX font %s - fontinfo=%s', fontinfo.dvifont.texname, fontinfo.__dict__) - # Font dictionary + # The font dictionary is the top-level object describing a font fontdictObject = self.reserveObject('font dictionary') fontdict = { 'Type': Name('Font'), 'Subtype': Name('Type1'), } - # We have a font file to embed - read it in and apply any effects + # Read the font file and apply any encoding changes and effects t1font = _type1font.Type1Font(fontinfo.fontfile) if fontinfo.encodingfile is not None: t1font = t1font.with_encoding( {i: c for i, c in enumerate(dviread._parse_enc(fontinfo.encodingfile))} ) - if fontinfo.effects: t1font = t1font.transform(fontinfo.effects) + + # Reduce the font to only the glyphs used in the document, get the encoding + # for that subset, and compute various properties based on the encoding. chars = frozenset(self._character_tracker.used[fontinfo.dvifont.fname]) t1font = t1font.subset(chars, self._get_subset_prefix(chars)) fontdict['BaseFont'] = Name(t1font.prop['FontName']) + # createType1Descriptor writes the font data as a side effect + fontdict['FontDescriptor'] = self.createType1Descriptor(t1font) encoding = t1font.prop['Encoding'] + fontdict['Encoding'] = self._generate_encoding(encoding) fc = fontdict['FirstChar'] = min(encoding.keys(), default=0) lc = fontdict['LastChar'] = max(encoding.keys(), default=255) - fontdict['Encoding'] = self._generate_encoding(encoding) - # Font descriptors may be shared between differently encoded - # Type-1 fonts, so only create a new descriptor if there is no - # existing descriptor for this font. - effects = (fontinfo.effects.get('slant', 0.0), - fontinfo.effects.get('extend', 1.0)) - fontdesc = self._type1Descriptors.get((fontinfo.fontfile, effects)) - if fontdesc is None: - fontdesc = self.createType1Descriptor(t1font) - self._type1Descriptors[(fontinfo.fontfile, effects)] = fontdesc - fontdict['FontDescriptor'] = fontdesc - - # Use TeX Font Metrics file to get glyph widths (TeX uses its 12.20 fixed point - # representation and we want 1/1000 text space units) + + # Convert glyph widths from TeX 12.20 fixed point to 1/1000 text space units tfm = fontinfo.dvifont._tfm widths = [(1000 * metrics.tex_width) >> 20 if (metrics := tfm.get_metrics(char)) else 0 for char in range(fc, lc + 1)] fontdict['Widths'] = widthsObject = self.reserveObject('glyph widths') self.writeObject(widthsObject, widths) + self.writeObject(fontdictObject, fontdict) return fontdictObject From 335e6b417100422f5d04631c8e27158e6a3a320e Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sat, 31 May 2025 13:20:56 +0200 Subject: [PATCH 27/47] Fix FT_CHECK compat with cibuildwheel. (#30123) --- src/ft2font.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ft2font.h b/src/ft2font.h index e1ebdb934329..8db0239ed4fd 100644 --- a/src/ft2font.h +++ b/src/ft2font.h @@ -6,7 +6,6 @@ #ifndef MPL_FT2FONT_H #define MPL_FT2FONT_H -#include #include #include #include @@ -42,11 +41,12 @@ inline char const* ft_error_string(FT_Error error) { // No more than 16 hex digits + "0x" + null byte for a 64-bit int error. #define THROW_FT_ERROR(name, err) { \ + std::string path{__FILE__}; \ char buf[20] = {0}; \ - sprintf(buf, "%#04x", err); \ + snprintf(buf, sizeof buf, "%#04x", err); \ throw std::runtime_error{ \ name " (" \ - + std::filesystem::path(__FILE__).filename().string() \ + + path.substr(path.find_last_of("/\\") + 1) \ + " line " + std::to_string(__LINE__) + ") failed with error " \ + std::string{buf} + ": " + std::string{ft_error_string(err)}}; \ } (void)0 From 2a82d0c3a462f0c34d115785c30408b48d94ee3f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 31 May 2025 08:39:30 -0400 Subject: [PATCH 28/47] Clean up AFM code (#30121) Since AFM is now private, we can delete unused methods without deprecation. Additionally, add `AFM.get_glyph_name` so that the PostScript mathtext code doesn't need to special case AFM files. --- lib/matplotlib/_afm.py | 145 +++++++------------------- lib/matplotlib/backends/backend_ps.py | 7 +- lib/matplotlib/tests/test_afm.py | 8 ++ lib/matplotlib/tests/test_text.py | 7 -- 4 files changed, 49 insertions(+), 118 deletions(-) diff --git a/lib/matplotlib/_afm.py b/lib/matplotlib/_afm.py index 558efe16392f..9094206c2d7c 100644 --- a/lib/matplotlib/_afm.py +++ b/lib/matplotlib/_afm.py @@ -1,5 +1,5 @@ """ -A python interface to Adobe Font Metrics Files. +A Python interface to Adobe Font Metrics Files. Although a number of other Python implementations exist, and may be more complete than this, it was decided not to go with them because they were @@ -16,19 +16,11 @@ >>> from pathlib import Path >>> afm_path = Path(mpl.get_data_path(), 'fonts', 'afm', 'ptmr8a.afm') >>> ->>> from matplotlib.afm import AFM +>>> from matplotlib._afm import AFM >>> with afm_path.open('rb') as fh: ... afm = AFM(fh) ->>> afm.string_width_height('What the heck?') -(6220.0, 694) >>> afm.get_fontname() 'Times-Roman' ->>> afm.get_kern_dist('A', 'f') -0 ->>> afm.get_kern_dist('A', 'y') --92.0 ->>> afm.get_bbox_char('!') -[130, -9, 238, 676] As in the Adobe Font Metrics File Format Specification, all dimensions are given in units of 1/1000 of the scale factor (point size) of the font @@ -87,20 +79,23 @@ def _to_bool(s): def _parse_header(fh): """ - Read the font metrics header (up to the char metrics) and returns - a dictionary mapping *key* to *val*. *val* will be converted to the - appropriate python type as necessary; e.g.: + Read the font metrics header (up to the char metrics). - * 'False'->False - * '0'->0 - * '-168 -218 1000 898'-> [-168, -218, 1000, 898] + Returns + ------- + dict + A dictionary mapping *key* to *val*. Dictionary keys are: - Dictionary keys are + StartFontMetrics, FontName, FullName, FamilyName, Weight, ItalicAngle, + IsFixedPitch, FontBBox, UnderlinePosition, UnderlineThickness, Version, + Notice, EncodingScheme, CapHeight, XHeight, Ascender, Descender, + StartCharMetrics - StartFontMetrics, FontName, FullName, FamilyName, Weight, - ItalicAngle, IsFixedPitch, FontBBox, UnderlinePosition, - UnderlineThickness, Version, Notice, EncodingScheme, CapHeight, - XHeight, Ascender, Descender, StartCharMetrics + *val* will be converted to the appropriate Python type as necessary, e.g.,: + + * 'False' -> False + * '0' -> 0 + * '-168 -218 1000 898' -> [-168, -218, 1000, 898] """ header_converters = { b'StartFontMetrics': _to_float, @@ -185,11 +180,9 @@ def _parse_header(fh): def _parse_char_metrics(fh): """ - Parse the given filehandle for character metrics information and return - the information as dicts. + Parse the given filehandle for character metrics information. - It is assumed that the file cursor is on the line behind - 'StartCharMetrics'. + It is assumed that the file cursor is on the line behind 'StartCharMetrics'. Returns ------- @@ -239,14 +232,15 @@ def _parse_char_metrics(fh): def _parse_kern_pairs(fh): """ - Return a kern pairs dictionary; keys are (*char1*, *char2*) tuples and - values are the kern pair value. For example, a kern pairs line like - ``KPX A y -50`` - - will be represented as:: + Return a kern pairs dictionary. - d[ ('A', 'y') ] = -50 + Returns + ------- + dict + Keys are (*char1*, *char2*) tuples and values are the kern pair value. For + example, a kern pairs line like ``KPX A y -50`` will be represented as:: + d['A', 'y'] = -50 """ line = next(fh) @@ -279,8 +273,7 @@ def _parse_kern_pairs(fh): def _parse_composites(fh): """ - Parse the given filehandle for composites information return them as a - dict. + Parse the given filehandle for composites information. It is assumed that the file cursor is on the line behind 'StartComposites'. @@ -363,36 +356,6 @@ def __init__(self, fh): self._metrics, self._metrics_by_name = _parse_char_metrics(fh) self._kern, self._composite = _parse_optional(fh) - def get_bbox_char(self, c, isord=False): - if not isord: - c = ord(c) - return self._metrics[c].bbox - - def string_width_height(self, s): - """ - Return the string width (including kerning) and string height - as a (*w*, *h*) tuple. - """ - if not len(s): - return 0, 0 - total_width = 0 - namelast = None - miny = 1e9 - maxy = 0 - for c in s: - if c == '\n': - continue - wx, name, bbox = self._metrics[ord(c)] - - total_width += wx + self._kern.get((namelast, name), 0) - l, b, w, h = bbox - miny = min(miny, b) - maxy = max(maxy, b + h) - - namelast = name - - return total_width, maxy - miny - def get_str_bbox_and_descent(self, s): """Return the string bounding box and the maximal descent.""" if not len(s): @@ -423,45 +386,29 @@ def get_str_bbox_and_descent(self, s): return left, miny, total_width, maxy - miny, -miny - def get_str_bbox(self, s): - """Return the string bounding box.""" - return self.get_str_bbox_and_descent(s)[:4] - - def get_name_char(self, c, isord=False): - """Get the name of the character, i.e., ';' is 'semicolon'.""" - if not isord: - c = ord(c) - return self._metrics[c].name + def get_glyph_name(self, glyph_ind): # For consistency with FT2Font. + """Get the name of the glyph, i.e., ord(';') is 'semicolon'.""" + return self._metrics[glyph_ind].name - def get_width_char(self, c, isord=False): + def get_char_index(self, c): # For consistency with FT2Font. """ - Get the width of the character from the character metric WX field. + Return the glyph index corresponding to a character code point. + + Note, for AFM fonts, we treat the glyph index the same as the codepoint. """ - if not isord: - c = ord(c) + return c + + def get_width_char(self, c): + """Get the width of the character code from the character metric WX field.""" return self._metrics[c].width def get_width_from_char_name(self, name): """Get the width of the character from a type1 character name.""" return self._metrics_by_name[name].width - def get_height_char(self, c, isord=False): - """Get the bounding box (ink) height of character *c* (space is 0).""" - if not isord: - c = ord(c) - return self._metrics[c].bbox[-1] - - def get_kern_dist(self, c1, c2): - """ - Return the kerning pair distance (possibly 0) for chars *c1* and *c2*. - """ - name1, name2 = self.get_name_char(c1), self.get_name_char(c2) - return self.get_kern_dist_from_name(name1, name2) - def get_kern_dist_from_name(self, name1, name2): """ - Return the kerning pair distance (possibly 0) for chars - *name1* and *name2*. + Return the kerning pair distance (possibly 0) for chars *name1* and *name2*. """ return self._kern.get((name1, name2), 0) @@ -493,7 +440,7 @@ def get_familyname(self): return re.sub(extras, '', name) @property - def family_name(self): + def family_name(self): # For consistency with FT2Font. """The font family name, e.g., 'Times'.""" return self.get_familyname() @@ -516,17 +463,3 @@ def get_xheight(self): def get_underline_thickness(self): """Return the underline thickness as float.""" return self._header[b'UnderlineThickness'] - - def get_horizontal_stem_width(self): - """ - Return the standard horizontal stem width as float, or *None* if - not specified in AFM file. - """ - return self._header.get(b'StdHW', None) - - def get_vertical_stem_width(self): - """ - Return the standard vertical stem width as float, or *None* if - not specified in AFM file. - """ - return self._header.get(b'StdVW', None) diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py index c1f4348016bb..f6b8455a15a7 100644 --- a/lib/matplotlib/backends/backend_ps.py +++ b/lib/matplotlib/backends/backend_ps.py @@ -24,7 +24,6 @@ import matplotlib as mpl from matplotlib import _api, cbook, _path, _text_helpers -from matplotlib._afm import AFM from matplotlib.backend_bases import ( _Backend, FigureCanvasBase, FigureManagerBase, RendererBase) from matplotlib.cbook import is_writable_file_like, file_requires_unicode @@ -787,7 +786,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None): width = font.get_width_from_char_name(name) except KeyError: name = 'question' - width = font.get_width_char('?') + width = font.get_width_char(ord('?')) kern = font.get_kern_dist_from_name(last_name, name) last_name = name thisx += kern * scale @@ -835,9 +834,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle): lastfont = font.postscript_name, fontsize self._pswriter.write( f"/{font.postscript_name} {fontsize} selectfont\n") - glyph_name = ( - font.get_name_char(chr(num)) if isinstance(font, AFM) else - font.get_glyph_name(font.get_char_index(num))) + glyph_name = font.get_glyph_name(font.get_char_index(num)) self._pswriter.write( f"{ox:g} {oy:g} moveto\n" f"/{glyph_name} glyphshow\n") diff --git a/lib/matplotlib/tests/test_afm.py b/lib/matplotlib/tests/test_afm.py index e5c6a83937cd..80cf8ac60feb 100644 --- a/lib/matplotlib/tests/test_afm.py +++ b/lib/matplotlib/tests/test_afm.py @@ -135,3 +135,11 @@ def test_malformed_header(afm_data, caplog): _afm._parse_header(fh) assert len(caplog.records) == 1 + + +def test_afm_kerning(): + fn = fm.findfont("Helvetica", fontext="afm") + with open(fn, 'rb') as fh: + afm = _afm.AFM(fh) + assert afm.get_kern_dist_from_name('A', 'V') == -70.0 + assert afm.get_kern_dist_from_name('V', 'A') == -80.0 diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py index 79a9e2d66c46..407d7a96be4d 100644 --- a/lib/matplotlib/tests/test_text.py +++ b/lib/matplotlib/tests/test_text.py @@ -208,13 +208,6 @@ def test_antialiasing(): mpl.rcParams['text.antialiased'] = False # Should not affect existing text. -def test_afm_kerning(): - fn = mpl.font_manager.findfont("Helvetica", fontext="afm") - with open(fn, 'rb') as fh: - afm = mpl._afm.AFM(fh) - assert afm.string_width_height('VAVAVAVAVAVA') == (7174.0, 718) - - @image_comparison(['text_contains.png']) def test_contains(): fig = plt.figure() From 155ae8a496e6a3faad6a9d7b3c7f5aa2853532b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trygve=20Magnus=20R=C3=A6der?= Date: Sun, 1 Jun 2025 14:13:44 +0200 Subject: [PATCH 29/47] Updates based on code review --- .../examples/images_contours_and_fields/multi_image.py | 10 +++++----- galleries/users_explain/colors/colorbar_only.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/galleries/examples/images_contours_and_fields/multi_image.py b/galleries/examples/images_contours_and_fields/multi_image.py index 9769dbf5219d..11be73f3a267 100644 --- a/galleries/examples/images_contours_and_fields/multi_image.py +++ b/galleries/examples/images_contours_and_fields/multi_image.py @@ -20,7 +20,8 @@ import matplotlib.pyplot as plt import numpy as np -import matplotlib as mpl +import matplotlib.colorizer as mcolorizer +import matplotlib.colors as mcolors np.random.seed(19680801) @@ -32,9 +33,9 @@ fig, axs = plt.subplots(2, 2) fig.suptitle('Multiple images') -# create a single norm and colorizer to be shared across all images -norm = mpl.colors.Normalize(vmin=np.min(datasets), vmax=np.max(datasets)) -colorizer = mpl.colorizer.Colorizer(norm=norm) +# create a colorizer with a predefined norm to be shared across all images +norm = mcolors.Normalize(vmin=np.min(datasets), vmax=np.max(datasets)) +colorizer = mcolorizer.Colorizer(norm=norm) images = [] for ax, data in zip(axs.flat, datasets): @@ -61,4 +62,3 @@ # - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar` # - `matplotlib.colorizer.Colorizer` # - `matplotlib.colors.Normalize` -# - `matplotlib.cbook.CallbackRegistry.connect` diff --git a/galleries/users_explain/colors/colorbar_only.py b/galleries/users_explain/colors/colorbar_only.py index ee97e91162ae..34de2bc78888 100644 --- a/galleries/users_explain/colors/colorbar_only.py +++ b/galleries/users_explain/colors/colorbar_only.py @@ -8,11 +8,11 @@ This tutorial shows how to build and customize standalone colorbars, i.e. without an attached plot. -A `~.Figure.colorbar` needs a "mappable" (`matplotlib.colorizer.ColorizingArtist`) -object (typically, an image) which contains a colorizer -(`matplotlib.colorizer.Colorizer`) that holds the data-to-color pipeline (norm and -colormap). In order to create a colorbar without an attached image, one can instead +A `~.Figure.colorbar` requires a `matplotlib.colorizer.ColorizingArtist` which +contains a `matplotlib.colorizer.Colorizer` that holds the data-to-color pipeline +(norm and colormap). To create a colorbar without an attached plot one can use a `.ColorizingArtist` with no associated data. + """ import matplotlib.pyplot as plt From 6083ecd880c950a705ba74107ff18b447e2c53dc Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 2 Jun 2025 10:02:01 +0100 Subject: [PATCH 30/47] Remove apply_theta_transforms argument (#30004) * Remove apply_theta_transforms argument * Improve formatting * Rename xxxxxx-DS.rst to 30004-DS.rst * Delete extra line --- .../next_api_changes/removals/30004-DS.rst | 10 ++++ .../next_api_changes/removals/xxxxxx-DS.rst | 4 -- .../axisartist/demo_axis_direction.py | 2 +- .../axisartist/demo_curvelinear_grid.py | 3 +- .../examples/axisartist/demo_floating_axes.py | 5 +- .../examples/axisartist/demo_floating_axis.py | 3 +- .../examples/axisartist/simple_axis_pad.py | 3 +- lib/matplotlib/projections/polar.py | 55 +++---------------- lib/matplotlib/projections/polar.pyi | 3 - lib/matplotlib/tests/test_transforms.py | 3 +- lib/matplotlib/text.py | 4 +- .../axisartist/tests/test_floating_axes.py | 4 +- .../tests/test_grid_helper_curvelinear.py | 6 +- 13 files changed, 29 insertions(+), 76 deletions(-) create mode 100644 doc/api/next_api_changes/removals/30004-DS.rst delete mode 100644 doc/api/next_api_changes/removals/xxxxxx-DS.rst diff --git a/doc/api/next_api_changes/removals/30004-DS.rst b/doc/api/next_api_changes/removals/30004-DS.rst new file mode 100644 index 000000000000..f5fdf214366c --- /dev/null +++ b/doc/api/next_api_changes/removals/30004-DS.rst @@ -0,0 +1,10 @@ +``apply_theta_transforms`` option in ``PolarTransform`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Applying theta transforms in `~matplotlib.projections.polar.PolarTransform` and +`~matplotlib.projections.polar.InvertedPolarTransform` has been removed, and +the ``apply_theta_transforms`` keyword argument removed from both classes. + +If you need to retain the behaviour where theta values +are transformed, chain the ``PolarTransform`` with a `~matplotlib.transforms.Affine2D` +transform that performs the theta shift and/or sign shift. diff --git a/doc/api/next_api_changes/removals/xxxxxx-DS.rst b/doc/api/next_api_changes/removals/xxxxxx-DS.rst deleted file mode 100644 index 8ae7919afa31..000000000000 --- a/doc/api/next_api_changes/removals/xxxxxx-DS.rst +++ /dev/null @@ -1,4 +0,0 @@ -``backend_ps.get_bbox_header`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -... is removed, as it is considered an internal helper. diff --git a/galleries/examples/axisartist/demo_axis_direction.py b/galleries/examples/axisartist/demo_axis_direction.py index 8c57b6c5a351..9540599c6a7b 100644 --- a/galleries/examples/axisartist/demo_axis_direction.py +++ b/galleries/examples/axisartist/demo_axis_direction.py @@ -22,7 +22,7 @@ def setup_axes(fig, rect): grid_helper = GridHelperCurveLinear( ( Affine2D().scale(np.pi/180., 1.) + - PolarAxes.PolarTransform(apply_theta_transforms=False) + PolarAxes.PolarTransform() ), extreme_finder=angle_helper.ExtremeFinderCycle( 20, 20, diff --git a/galleries/examples/axisartist/demo_curvelinear_grid.py b/galleries/examples/axisartist/demo_curvelinear_grid.py index 40853dee12cb..fb1fbdd011ce 100644 --- a/galleries/examples/axisartist/demo_curvelinear_grid.py +++ b/galleries/examples/axisartist/demo_curvelinear_grid.py @@ -54,8 +54,7 @@ def curvelinear_test2(fig): # PolarAxes.PolarTransform takes radian. However, we want our coordinate # system in degree - tr = Affine2D().scale(np.pi/180, 1) + PolarAxes.PolarTransform( - apply_theta_transforms=False) + tr = Affine2D().scale(np.pi/180, 1) + PolarAxes.PolarTransform() # Polar projection, which involves cycle, and also has limits in # its coordinates, needs a special method to find the extremes # (min, max of the coordinate within the view). diff --git a/galleries/examples/axisartist/demo_floating_axes.py b/galleries/examples/axisartist/demo_floating_axes.py index 632f6d237aa6..add03e266d3e 100644 --- a/galleries/examples/axisartist/demo_floating_axes.py +++ b/galleries/examples/axisartist/demo_floating_axes.py @@ -54,7 +54,7 @@ def setup_axes2(fig, rect): With custom locator and formatter. Note that the extreme values are swapped. """ - tr = PolarAxes.PolarTransform(apply_theta_transforms=False) + tr = PolarAxes.PolarTransform() pi = np.pi angle_ticks = [(0, r"$0$"), @@ -99,8 +99,7 @@ def setup_axes3(fig, rect): # scale degree to radians tr_scale = Affine2D().scale(np.pi/180., 1.) - tr = tr_rotate + tr_scale + PolarAxes.PolarTransform( - apply_theta_transforms=False) + tr = tr_rotate + tr_scale + PolarAxes.PolarTransform() grid_locator1 = angle_helper.LocatorHMS(4) tick_formatter1 = angle_helper.FormatterHMS() diff --git a/galleries/examples/axisartist/demo_floating_axis.py b/galleries/examples/axisartist/demo_floating_axis.py index 5296b682367b..0894bf8f4ce1 100644 --- a/galleries/examples/axisartist/demo_floating_axis.py +++ b/galleries/examples/axisartist/demo_floating_axis.py @@ -22,8 +22,7 @@ def curvelinear_test2(fig): """Polar projection, but in a rectangular box.""" # see demo_curvelinear_grid.py for details - tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform( - apply_theta_transforms=False) + tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform() extreme_finder = angle_helper.ExtremeFinderCycle(20, 20, diff --git a/galleries/examples/axisartist/simple_axis_pad.py b/galleries/examples/axisartist/simple_axis_pad.py index 95f30ce1ffbc..f40a1aa9f273 100644 --- a/galleries/examples/axisartist/simple_axis_pad.py +++ b/galleries/examples/axisartist/simple_axis_pad.py @@ -21,8 +21,7 @@ def setup_axes(fig, rect): """Polar projection, but in a rectangular box.""" # see demo_curvelinear_grid.py for details - tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform( - apply_theta_transforms=False) + tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform() extreme_finder = angle_helper.ExtremeFinderCycle(20, 20, lon_cycle=360, diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py index 71224fb3affe..948b3a6e704f 100644 --- a/lib/matplotlib/projections/polar.py +++ b/lib/matplotlib/projections/polar.py @@ -15,20 +15,6 @@ from matplotlib.spines import Spine -def _apply_theta_transforms_warn(): - _api.warn_deprecated( - "3.9", - message=( - "Passing `apply_theta_transforms=True` (the default) " - "is deprecated since Matplotlib %(since)s. " - "Support for this will be removed in Matplotlib in %(removal)s. " - "To prevent this warning, set `apply_theta_transforms=False`, " - "and make sure to shift theta values before being passed to " - "this transform." - ) - ) - - class PolarTransform(mtransforms.Transform): r""" The base polar transform. @@ -48,8 +34,7 @@ class PolarTransform(mtransforms.Transform): input_dims = output_dims = 2 - def __init__(self, axis=None, use_rmin=True, *, - apply_theta_transforms=True, scale_transform=None): + def __init__(self, axis=None, use_rmin=True, *, scale_transform=None): """ Parameters ---------- @@ -64,15 +49,12 @@ def __init__(self, axis=None, use_rmin=True, *, super().__init__() self._axis = axis self._use_rmin = use_rmin - self._apply_theta_transforms = apply_theta_transforms self._scale_transform = scale_transform - if apply_theta_transforms: - _apply_theta_transforms_warn() __str__ = mtransforms._make_str_method( "_axis", - use_rmin="_use_rmin", - apply_theta_transforms="_apply_theta_transforms") + use_rmin="_use_rmin" + ) def _get_rorigin(self): # Get lower r limit after being scaled by the radial scale transform @@ -82,11 +64,6 @@ def _get_rorigin(self): def transform_non_affine(self, values): # docstring inherited theta, r = np.transpose(values) - # PolarAxes does not use the theta transforms here, but apply them for - # backwards-compatibility if not being used by it. - if self._apply_theta_transforms and self._axis is not None: - theta *= self._axis.get_theta_direction() - theta += self._axis.get_theta_offset() if self._use_rmin and self._axis is not None: r = (r - self._get_rorigin()) * self._axis.get_rsign() r = np.where(r >= 0, r, np.nan) @@ -148,10 +125,7 @@ def transform_path_non_affine(self, path): def inverted(self): # docstring inherited - return PolarAxes.InvertedPolarTransform( - self._axis, self._use_rmin, - apply_theta_transforms=self._apply_theta_transforms - ) + return PolarAxes.InvertedPolarTransform(self._axis, self._use_rmin) class PolarAffine(mtransforms.Affine2DBase): @@ -209,8 +183,7 @@ class InvertedPolarTransform(mtransforms.Transform): """ input_dims = output_dims = 2 - def __init__(self, axis=None, use_rmin=True, - *, apply_theta_transforms=True): + def __init__(self, axis=None, use_rmin=True): """ Parameters ---------- @@ -225,26 +198,16 @@ def __init__(self, axis=None, use_rmin=True, super().__init__() self._axis = axis self._use_rmin = use_rmin - self._apply_theta_transforms = apply_theta_transforms - if apply_theta_transforms: - _apply_theta_transforms_warn() __str__ = mtransforms._make_str_method( "_axis", - use_rmin="_use_rmin", - apply_theta_transforms="_apply_theta_transforms") + use_rmin="_use_rmin") def transform_non_affine(self, values): # docstring inherited x, y = values.T r = np.hypot(x, y) theta = (np.arctan2(y, x) + 2 * np.pi) % (2 * np.pi) - # PolarAxes does not use the theta transforms here, but apply them for - # backwards-compatibility if not being used by it. - if self._apply_theta_transforms and self._axis is not None: - theta -= self._axis.get_theta_offset() - theta *= self._axis.get_theta_direction() - theta %= 2 * np.pi if self._use_rmin and self._axis is not None: r += self._axis.get_rorigin() r *= self._axis.get_rsign() @@ -252,10 +215,7 @@ def transform_non_affine(self, values): def inverted(self): # docstring inherited - return PolarAxes.PolarTransform( - self._axis, self._use_rmin, - apply_theta_transforms=self._apply_theta_transforms - ) + return PolarAxes.PolarTransform(self._axis, self._use_rmin) class ThetaFormatter(mticker.Formatter): @@ -895,7 +855,6 @@ def _set_lim_and_transforms(self): # data. This one is aware of rmin self.transProjection = self.PolarTransform( self, - apply_theta_transforms=False, scale_transform=self.transScale ) # Add dependency on rorigin. diff --git a/lib/matplotlib/projections/polar.pyi b/lib/matplotlib/projections/polar.pyi index de1cbc293900..fc1d508579b5 100644 --- a/lib/matplotlib/projections/polar.pyi +++ b/lib/matplotlib/projections/polar.pyi @@ -18,7 +18,6 @@ class PolarTransform(mtransforms.Transform): axis: PolarAxes | None = ..., use_rmin: bool = ..., *, - apply_theta_transforms: bool = ..., scale_transform: mtransforms.Transform | None = ..., ) -> None: ... def inverted(self) -> InvertedPolarTransform: ... @@ -35,8 +34,6 @@ class InvertedPolarTransform(mtransforms.Transform): self, axis: PolarAxes | None = ..., use_rmin: bool = ..., - *, - apply_theta_transforms: bool = ..., ) -> None: ... def inverted(self) -> PolarTransform: ... diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py index 99647e99bbde..b4db34db5a91 100644 --- a/lib/matplotlib/tests/test_transforms.py +++ b/lib/matplotlib/tests/test_transforms.py @@ -891,8 +891,7 @@ def test_str_transform(): Affine2D().scale(1.0))), PolarTransform( PolarAxes(0.125,0.1;0.775x0.8), - use_rmin=True, - apply_theta_transforms=False)), + use_rmin=True)), CompositeGenericTransform( CompositeGenericTransform( PolarAffine( diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py index 3b0de58814d9..acde4fb179a2 100644 --- a/lib/matplotlib/text.py +++ b/lib/matplotlib/text.py @@ -1553,9 +1553,7 @@ def _get_xy_transform(self, renderer, coords): return self.axes.transData elif coords == 'polar': from matplotlib.projections import PolarAxes - tr = PolarAxes.PolarTransform(apply_theta_transforms=False) - trans = tr + self.axes.transData - return trans + return PolarAxes.PolarTransform() + self.axes.transData try: bbox_name, unit = coords.split() diff --git a/lib/mpl_toolkits/axisartist/tests/test_floating_axes.py b/lib/mpl_toolkits/axisartist/tests/test_floating_axes.py index 362384221bdd..feb667af013e 100644 --- a/lib/mpl_toolkits/axisartist/tests/test_floating_axes.py +++ b/lib/mpl_toolkits/axisartist/tests/test_floating_axes.py @@ -26,7 +26,7 @@ def test_curvelinear3(): fig = plt.figure(figsize=(5, 5)) tr = (mtransforms.Affine2D().scale(np.pi / 180, 1) + - mprojections.PolarAxes.PolarTransform(apply_theta_transforms=False)) + mprojections.PolarAxes.PolarTransform()) grid_helper = GridHelperCurveLinear( tr, extremes=(0, 360, 10, 3), @@ -75,7 +75,7 @@ def test_curvelinear4(): fig = plt.figure(figsize=(5, 5)) tr = (mtransforms.Affine2D().scale(np.pi / 180, 1) + - mprojections.PolarAxes.PolarTransform(apply_theta_transforms=False)) + mprojections.PolarAxes.PolarTransform()) grid_helper = GridHelperCurveLinear( tr, extremes=(120, 30, 10, 0), diff --git a/lib/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py index 1b266044bdd0..7d6554782fe6 100644 --- a/lib/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py +++ b/lib/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py @@ -82,8 +82,7 @@ def test_polar_box(): # PolarAxes.PolarTransform takes radian. However, we want our coordinate # system in degree - tr = (Affine2D().scale(np.pi / 180., 1.) + - PolarAxes.PolarTransform(apply_theta_transforms=False)) + tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform() # polar projection, which involves cycle, and also has limits in # its coordinates, needs a special method to find the extremes @@ -145,8 +144,7 @@ def test_axis_direction(): # PolarAxes.PolarTransform takes radian. However, we want our coordinate # system in degree - tr = (Affine2D().scale(np.pi / 180., 1.) + - PolarAxes.PolarTransform(apply_theta_transforms=False)) + tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform() # polar projection, which involves cycle, and also has limits in # its coordinates, needs a special method to find the extremes From fea06c94baa25b64c33fc3acbc214c32cecc4ac0 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Sat, 13 Jul 2024 10:53:22 +0200 Subject: [PATCH 31/47] ENH: Add grouped_bar() method --- doc/_embedded_plots/grouped_bar.py | 15 ++ doc/api/axes_api.rst | 1 + doc/api/pyplot_summary.rst | 1 + doc/users/next_whats_new/grouped_bar.rst | 25 ++ lib/matplotlib/axes/_axes.py | 326 +++++++++++++++++++++++ lib/matplotlib/axes/_axes.pyi | 19 ++ lib/matplotlib/pyplot.py | 28 ++ tools/boilerplate.py | 1 + 8 files changed, 416 insertions(+) create mode 100644 doc/_embedded_plots/grouped_bar.py create mode 100644 doc/users/next_whats_new/grouped_bar.rst diff --git a/doc/_embedded_plots/grouped_bar.py b/doc/_embedded_plots/grouped_bar.py new file mode 100644 index 000000000000..f02e269328d2 --- /dev/null +++ b/doc/_embedded_plots/grouped_bar.py @@ -0,0 +1,15 @@ +import matplotlib.pyplot as plt + +categories = ['A', 'B'] +data0 = [1.0, 3.0] +data1 = [1.4, 3.4] +data2 = [1.8, 3.8] + +fig, ax = plt.subplots(figsize=(4, 2.2)) +ax.grouped_bar( + [data0, data1, data2], + tick_labels=categories, + labels=['dataset 0', 'dataset 1', 'dataset 2'], + colors=['#1f77b4', '#58a1cf', '#abd0e6'], +) +ax.legend() diff --git a/doc/api/axes_api.rst b/doc/api/axes_api.rst index 4bbcbe081194..b742ce9b7a55 100644 --- a/doc/api/axes_api.rst +++ b/doc/api/axes_api.rst @@ -67,6 +67,7 @@ Basic Axes.bar Axes.barh Axes.bar_label + Axes.grouped_bar Axes.stem Axes.eventplot diff --git a/doc/api/pyplot_summary.rst b/doc/api/pyplot_summary.rst index cdd57bfe6276..c4a860fd2590 100644 --- a/doc/api/pyplot_summary.rst +++ b/doc/api/pyplot_summary.rst @@ -60,6 +60,7 @@ Basic bar barh bar_label + grouped_bar stem eventplot pie diff --git a/doc/users/next_whats_new/grouped_bar.rst b/doc/users/next_whats_new/grouped_bar.rst new file mode 100644 index 000000000000..64f2905fbf0c --- /dev/null +++ b/doc/users/next_whats_new/grouped_bar.rst @@ -0,0 +1,25 @@ +Grouped bar charts +------------------ + +The new method `~.Axes.grouped_bar()` simplifies the creation of grouped bar charts +significantly. It supports different input data types (lists of datasets, dicts of +datasets, data in 2D arrays, pandas DataFrames), and allows for easy customization +of placement via controllable distances between bars and between bar groups. + +Example: + +.. plot:: + :include-source: true + + import matplotlib.pyplot as plt + + categories = ['A', 'B'] + datasets = { + 'dataset 0': [1.0, 3.0], + 'dataset 1': [1.4, 3.4], + 'dataset 2': [1.8, 3.8], + } + + fig, ax = plt.subplots(figsize=(4, 2.2)) + ax.grouped_bar(datasets, tick_labels=categories) + ax.legend() diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index e480f8f29598..e10c1808176a 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -64,6 +64,23 @@ def _make_axes_method(func): return func +class _GroupedBarReturn: + """ + A provisional result object for `.Axes.grouped_bar`. + + This is a placeholder for a future better return type. We try to build in + backward compatibility / migration possibilities. + + The only public interfaces are the ``bar_containers`` attribute and the + ``remove()`` method. + """ + def __init__(self, bar_containers): + self.bar_containers = bar_containers + + def remove(self): + [b.remove() for b in self.bars] + + @_docstring.interpd class Axes(_AxesBase): """ @@ -2414,6 +2431,7 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center", See Also -------- barh : Plot a horizontal bar plot. + grouped_bar : Plot multiple datasets as grouped bar plot. Notes ----- @@ -3014,6 +3032,314 @@ def broken_barh(self, xranges, yrange, **kwargs): return col + @_docstring.interpd + def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing=0, + tick_labels=None, labels=None, orientation="vertical", colors=None, + **kwargs): + """ + Make a grouped bar plot. + + .. note:: + This function is new in v3.11, and the API is still provisional. + We may still fine-tune some aspects based on user-feedback. + + This is a convenience function to plot bars for multiple datasets. + In particular, it simplifies positioning of the bars compared to individual + `~.Axes.bar` plots. + + Bar plots present categorical data as a sequence of bars, one bar per category. + We call one set of such values a *dataset* and it's bars all share the same + color. Grouped bar plots show multiple such datasets, where the values per + category are grouped together. The category names are drawn as tick labels + below the bar groups. Each dataset has a distinct bar color, and can optionally + get a label that is used for the legend. + + Here is an example call structure and the corresponding plot: + + .. code-block:: python + + grouped_bar([dataset_1, dataset_2, dataset_3], + tick_labels=['A', 'B'], + labels=['dataset 1', 'dataset 2', 'dataset 3']) + + .. plot:: _embedded_plots/grouped_bar.py + + Parameters + ---------- + heights : list of array-like or dict of array-like or 2D array \ +or pandas.DataFrame + The heights for all x and groups. One of: + + - list of array-like: A list of datasets, each dataset must have + the same number of elements. + + .. code-block:: none + + # category_A, category_B + dataset_0 = [ds0_A, ds0_B] + dataset_1 = [ds1_A, ds1_B] + dataset_2 = [ds2_A, ds2_B] + + Example call:: + + grouped_bar([dataset_0, dataset_1, dataset_2]) + + - dict of array-like: A mapping from names to datasets. Each dataset + (dict value) must have the same number of elements. + + This is similar to passing a list of array-like, with the addition that + each dataset gets a name. + + Example call: + + .. code-block:: python + + grouped_bar({'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2]}) + + The names are used as *labels*, i.e. the following two calls are + equivalent: + + .. code-block:: python + + data_dict = {'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2]} + grouped_bar(data_dict) + grouped_bar(data_dict.values(), labels=data_dict.keys()) + + When using a dict-like input, you must not pass *labels* explicitly. + + - a 2D array: The rows are the categories, the columns are the different + datasets. + + .. code-block:: none + + dataset_0 dataset_1 dataset_2 + category_A ds0_a ds1_a ds2_a + category_B ds0_b ds1_b ds2_b + + Example call: + + .. code-block:: python + + group_labels = ["group_A", "group_B"] + dataset_labels = ["dataset_0", "dataset_1", "dataset_2"] + array = np.random.random((2, 3)) + + Note that this is consistent with pandas. These two calls produce + the same bar plot structure: + + .. code-block:: python + + grouped_bar(array, tick_labels=categories, labels=dataset_labels) + df = pd.DataFrame(array, index=categories, columns=dataset_labels) + df.plot.bar() + + - a `pandas.DataFrame`. + + .. code-block:: python + + df = pd.DataFrame( + np.random.random((2, 3)) + index=["group_A", "group_B"], + columns=["dataset_0", "dataset_1", "dataset_2"] + ) + grouped_bar(df) + + Note that ``grouped_bar(df)`` produces a structurally equivalent plot like + ``df.plot.bar()``. + + positions : array-like, optional + The center positions of the bar groups. The values have to be equidistant. + If not given, a sequence of integer positions 0, 1, 2, ... is used. + + tick_labels : list of str, optional + The category labels, which are placed on ticks at the center *positions* + of the bar groups. + + If not set, the axis ticks (positions and labels) are left unchanged. + + labels : list of str, optional + The labels of the datasets, i.e. the bars within one group. + These will show up in the legend. + + group_spacing : float, default: 1.5 + The space between two bar groups in units of bar width. + + The default value of 1.5 thus means that there's a gap of + 1.5 bar widths between bar groups. + + bar_spacing : float, default: 0 + The space between bars in units of bar width. + + orientation : {"vertical", "horizontal"}, default: "vertical" + The direction of the bars. + + colors : list of :mpltype:`color`, optional + A sequence of colors to be cycled through and used to color bars + of the different datasets. The sequence need not be exactly the + same length as the number of provided y, in which case the colors + will repeat from the beginning. + + If not specified, the colors from the Axes property cycle will be used. + + **kwargs : `.Rectangle` properties + + %(Rectangle:kwdoc)s + + Returns + ------- + _GroupedBarReturn + + A provisional result object. This will be refined in the future. + For now, the guaranteed API on the returned object is limited to + + - the attribute ``bar_containers``, which is a list of + `.BarContainer`, i.e. the results of the individual `~.Axes.bar` + calls for each dataset. + + - a ``remove()`` method, that remove all bars from the Axes. + See also `.Artist.remove()`. + + See Also + -------- + bar : A lower-level API for bar plots, with more degrees of freedom like + individual bar sizes and colors. + + Notes + ----- + For a better understanding, we compare the `~.Axes.grouped_bar` API with + those of `~.Axes.bar` and `~.Axes.boxplot`. + + **Comparison to bar()** + + `~.Axes.grouped_bar` intentionally deviates from the `~.Axes.bar` API in some + aspects. ``bar(x, y)`` is a lower-level API and places bars with height *y* + at explicit positions *x*. It also allows to specify individual bar widths + and colors. This kind of detailed control and flexibility is difficult to + manage and often not needed when plotting multiple datasets as grouped bar + plot. Therefore, ``grouped_bar`` focusses on the abstraction of bar plots + as visualization of categorical data. + + The following examples may help to transfer from ``bar`` to + ``grouped_bar``. + + Positions are de-emphasized due to categories, and default to integer values. + If you have used ``range(N)`` as positions, you can leave that value out:: + + bar(range(N), heights) + grouped_bar([heights]) + + If needed, positions can be passed as keyword arguments:: + + bar(x, heights) + grouped_bar([heights], positions=x) + + To place category labels in `~.Axes.bar` you could use the argument + *tick_label* or use a list of category names as *x*. + `~.Axes.grouped_bar` expects them in the argument *tick_labels*:: + + bar(range(N), heights, tick_label=["A", "B"]) + bar(["A", "B"], heights) + grouped_bar([heights], tick_labels=["A", "B"]) + + Dataset labels, which are shown in the legend, are still passed via the + *label* parameter:: + + bar(..., label="dataset") + grouped_bar(..., label=["dataset"]) + + **Comparison to boxplot()** + + Both, `~.Axes.grouped_bar` and `~.Axes.boxplot` visualize categorical data + from multiple datasets. The basic API on *tick_labels* and *positions* + is the same, so that you can easily switch between plotting all + individual values as `~.Axes.grouped_bar` or the statistical distribution + per category as `~.Axes.boxplot`:: + + grouped_bar(values, positions=..., tick_labels=...) + boxplot(values, positions=..., tick_labels=...) + + """ + if cbook._is_pandas_dataframe(heights): + if labels is None: + labels = heights.columns.tolist() + if tick_labels is None: + tick_labels = heights.index.tolist() + heights = heights.to_numpy().T + elif hasattr(heights, 'keys'): # dict + if labels is not None: + raise ValueError( + "'labels' cannot be used if 'heights' are a mapping") + labels = heights.keys() + heights = list(heights.values()) + elif hasattr(heights, 'shape'): # numpy array + heights = heights.T + + num_datasets = len(heights) + dataset_0 = next(iter(heights)) + num_groups = len(dataset_0) + + if positions is None: + group_centers = np.arange(num_groups) + group_distance = 1 + else: + group_centers = np.asanyarray(positions) + if len(group_centers) > 1: + d = np.diff(group_centers) + if not np.allclose(d, d.mean()): + raise ValueError("'positions' must be equidistant") + group_distance = d[0] + else: + group_distance = 1 + + for i, dataset in enumerate(heights): + if len(dataset) != num_groups: + raise ValueError( + f"'x' indicates {num_groups} groups, but dataset {i} " + f"has {len(dataset)} groups" + ) + + _api.check_in_list(["vertical", "horizontal"], orientation=orientation) + + if colors is None: + colors = itertools.cycle([None]) + else: + # Note: This is equivalent to the behavior in stackplot + # TODO: do we want to be more restrictive and check lengths? + colors = itertools.cycle(colors) + + bar_width = (group_distance / + (num_datasets + (num_datasets - 1) * bar_spacing + group_spacing)) + bar_spacing_abs = bar_spacing * bar_width + margin_abs = 0.5 * group_spacing * bar_width + + if labels is None: + labels = [None] * num_datasets + else: + assert len(labels) == num_datasets + + # place the bars, but only use numerical positions, categorical tick labels + # are handled separately below + bar_containers = [] + for i, (hs, label, color) in enumerate( + zip(heights, labels, colors)): + lefts = (group_centers - 0.5 * group_distance + margin_abs + + i * (bar_width + bar_spacing_abs)) + if orientation == "vertical": + bc = self.bar(lefts, hs, width=bar_width, align="edge", + label=label, color=color, **kwargs) + else: + bc = self.barh(lefts, hs, height=bar_width, align="edge", + label=label, color=color, **kwargs) + bar_containers.append(bc) + + if tick_labels is not None: + if orientation == "vertical": + self.xaxis.set_ticks(group_centers, labels=tick_labels) + else: + self.yaxis.set_ticks(group_centers, labels=tick_labels) + + return _GroupedBarReturn(bar_containers) + @_preprocess_data() def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0, label=None, orientation='vertical'): diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi index c3eb28d2f095..f606a65753f4 100644 --- a/lib/matplotlib/axes/_axes.pyi +++ b/lib/matplotlib/axes/_axes.pyi @@ -37,6 +37,12 @@ from typing import Any, Literal, overload import numpy as np from numpy.typing import ArrayLike from matplotlib.typing import ColorType, MarkerType, LineStyleType +import pandas as pd + + +class _GroupedBarReturn: + def __init__(self, bar_containers: list[BarContainer]) -> None: ... + def remove(self) -> None: ... class Axes(_AxesBase): def get_title(self, loc: Literal["left", "center", "right"] = ...) -> str: ... @@ -265,6 +271,19 @@ class Axes(_AxesBase): data=..., **kwargs ) -> PolyCollection: ... + def grouped_bar( + self, + heights : Sequence[ArrayLike] | dict[str, ArrayLike] | np.ndarray | pd.DataFrame, + *, + positions : ArrayLike | None = ..., + tick_labels : Sequence[str] | None = ..., + labels : Sequence[str] | None = ..., + group_spacing : float | None = ..., + bar_spacing : float | None = ..., + orientation: Literal["vertical", "horizontal"] = ..., + colors: Iterable[ColorType] | None = ..., + **kwargs + ) -> list[BarContainer]: ... def stem( self, *args: ArrayLike | str, diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index 78fc962d9c5c..cf5c9b4b739f 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -93,6 +93,7 @@ import PIL.Image from numpy.typing import ArrayLike + import pandas as pd import matplotlib.axes import matplotlib.artist @@ -3404,6 +3405,33 @@ def grid( gca().grid(visible=visible, which=which, axis=axis, **kwargs) +# Autogenerated by boilerplate.py. Do not edit as changes will be lost. +@_copy_docstring_and_deprecators(Axes.grouped_bar) +def grouped_bar( + heights: Sequence[ArrayLike] | dict[str, ArrayLike] | np.ndarray | pd.DataFrame, + *, + positions: ArrayLike | None = None, + group_spacing: float | None = 1.5, + bar_spacing: float | None = 0, + tick_labels: Sequence[str] | None = None, + labels: Sequence[str] | None = None, + orientation: Literal["vertical", "horizontal"] = "vertical", + colors: Iterable[ColorType] | None = None, + **kwargs, +) -> list[BarContainer]: + return gca().grouped_bar( + heights, + positions=positions, + group_spacing=group_spacing, + bar_spacing=bar_spacing, + tick_labels=tick_labels, + labels=labels, + orientation=orientation, + colors=colors, + **kwargs, + ) + + # Autogenerated by boilerplate.py. Do not edit as changes will be lost. @_copy_docstring_and_deprecators(Axes.hexbin) def hexbin( diff --git a/tools/boilerplate.py b/tools/boilerplate.py index f018dfc887c8..11ec15ac1c44 100644 --- a/tools/boilerplate.py +++ b/tools/boilerplate.py @@ -238,6 +238,7 @@ def boilerplate_gen(): 'fill_between', 'fill_betweenx', 'grid', + 'grouped_bar', 'hexbin', 'hist', 'stairs', From 556895dd9f22fd6d660cadbbf74b309df08c30f1 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:56:56 +0100 Subject: [PATCH 32/47] Add tests for grouped_bar() --- .../baseline_images/test_axes/grouped_bar.png | Bin 0 -> 3914 bytes lib/matplotlib/tests/test_axes.py | 85 ++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 lib/matplotlib/tests/baseline_images/test_axes/grouped_bar.png diff --git a/lib/matplotlib/tests/baseline_images/test_axes/grouped_bar.png b/lib/matplotlib/tests/baseline_images/test_axes/grouped_bar.png new file mode 100644 index 0000000000000000000000000000000000000000..19d676a6b6629d12cfcdddec42b7fc329e35078a GIT binary patch literal 3914 zcmd^Cdr*^C7QX>Te1a`n6qL|9Te=J76?q9EELzY-LB(hw<&k0pf+Qdb(C`Qq&}FC~ zt@0)mqeKD;E;K{}BviK`%QFZG@(?JdZ_x96_yM%w`ZyG|TGb`}7w6aZjjTems}Om&kFrD|m1U zM~=EoB3};w$}|>#B_^CiL|EEbTUuLQ#K+p$96oFwdNJgptsMeyYvW{j(bn45&f3Nn zVPP6ZCP&2_v9gN%m%b(GN~jgA_S^tuV_Vd5zZd}Yahex)AH@s@KrjEqu|J=SFP0An zh3zH7Tjv!8J8qBzF}U`hKJ=h`OhNy}^hDY>djc>y7CAHJ%`*PNCs()gxAW(}I$QPG z)fxD?JpuRjJUKxA7-x~s-p#E0nX!M)#c*B+Nef0wlZRA|fqBLUT)&4qlW3vSWc~<| z2f$xN5-Q}5mlx0iX&x6Qh|=!;!iG zlSbrW7Zw)m933%9Nd<8@tyi`k9UXl=J*Q>+L9-f1rSk0~2m7cV2GB|smd9bOJGyCW zYu}InkZI%KaN+3DqcqoSvkz19#)GU@^>*&u>IN{l@6?Ir3+W_~60Efwn0^a%z}7en-OU>?ntBXY?Mt4UfO_D?b;CF=9Xz;G4|~U+ zdgo?*-xQyYQh|k;!h5|Bf=Vu!D2JfJlx<#ZY!s^oENb^eH9P`|6FnbH2$gLE4<`Q) zM%Q`c)2>7$?o4ug^aaRh^XS-?-!gjNH?-g7czM5L)EtiHe!L+zi&bA=U-|mY4&mAa z%VqBNk^-exOw%HNoK&nX%hhiv0?~Iu5^;`izMgNc>_D@NW0ptjs&B>QB~G#4aw5hF z#q}tYN;bjpd2Q#)4&ji=UCSaL-m}7}?UFbm3JRdCnnE|L(HZ8(CRmXGNng z#C-bYv9jU%7!706)i3O9hpGD;mVYU zsXci?$$kxS3Qp4MQh$XnQ~D(5kW$VY6=xWjNed%5;mB;07h7)P<%_dVH7=DVuY@0T zjQXK2a_GEO)8bhus0SjEXhk($DqHAAsTU#?LUl6o?W@NWX5hhaF9v^>%; zkxcK^%e`gnmdl-=pC5b}9Wnw1rTn{rPoFWV@l2j&00Eh4ia;PJGd*R4HF&Q8+M1F* z-4k*tG*nhZ5>!Aga_R2-U{7l7p(q&)M*l2XD)NN0YeT!mW~GU})Q^yJnO1`P-b`Nz z6{0{jRhXZDpEsJ^aHPar7QUE2J3Gr_4K{uqGw}!LK()ZOW*w|-Yik>9h$ErV>>#1Q zggR4pggkS42)EdnFjvnkFE1w$2&^m zgal*iT3T9ILZOgOl~$mH_6US8YW+<}XIGc_+Ad8F^4Na0<=3uXuVfM8;~(moxL_hA z9JVGALKe(;5{QiuS5+`elldN=p4e`Nr|JO2|3B?2cJejzp;vJuB;wC`!@rbF ne`&Wt`}0zM{ViY<$Fy4K(~;@DGx{YA06izZ@IJ Date: Wed, 22 Jan 2025 18:47:48 +0100 Subject: [PATCH 33/47] Simplify "Grouped bar chart with labels" using grouped_bar() --- .../examples/lines_bars_and_markers/barchart.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/galleries/examples/lines_bars_and_markers/barchart.py b/galleries/examples/lines_bars_and_markers/barchart.py index f2157a89c0cd..dbb0f5bbbadd 100644 --- a/galleries/examples/lines_bars_and_markers/barchart.py +++ b/galleries/examples/lines_bars_and_markers/barchart.py @@ -10,7 +10,6 @@ # data from https://allisonhorst.github.io/palmerpenguins/ import matplotlib.pyplot as plt -import numpy as np species = ("Adelie", "Chinstrap", "Gentoo") penguin_means = { @@ -19,22 +18,15 @@ 'Flipper Length': (189.95, 195.82, 217.19), } -x = np.arange(len(species)) # the label locations -width = 0.25 # the width of the bars -multiplier = 0 - fig, ax = plt.subplots(layout='constrained') -for attribute, measurement in penguin_means.items(): - offset = width * multiplier - rects = ax.bar(x + offset, measurement, width, label=attribute) - ax.bar_label(rects, padding=3) - multiplier += 1 +res = ax.grouped_bar(penguin_means, tick_labels=species, group_spacing=1) +for container in res.bar_containers: + ax.bar_label(container, padding=3) -# Add some text for labels, title and custom x-axis tick labels, etc. +# Add some text for labels, title, etc. ax.set_ylabel('Length (mm)') ax.set_title('Penguin attributes by species') -ax.set_xticks(x + width, species) ax.legend(loc='upper left', ncols=3) ax.set_ylim(0, 250) From 7fa82d7ed9bdbf2934e0b37bd70b3f8e960310b4 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:20:18 +0100 Subject: [PATCH 34/47] Apply suggestions from code review Co-authored-by: hannah --- doc/users/next_whats_new/grouped_bar.rst | 9 +-- lib/matplotlib/axes/_axes.py | 90 +++++++++++------------- 2 files changed, 48 insertions(+), 51 deletions(-) diff --git a/doc/users/next_whats_new/grouped_bar.rst b/doc/users/next_whats_new/grouped_bar.rst index 64f2905fbf0c..af57c71b8a3a 100644 --- a/doc/users/next_whats_new/grouped_bar.rst +++ b/doc/users/next_whats_new/grouped_bar.rst @@ -10,16 +10,17 @@ Example: .. plot:: :include-source: true + :alt: Diagram of a grouped bar chart of 3 datasets with 2 categories. import matplotlib.pyplot as plt categories = ['A', 'B'] datasets = { - 'dataset 0': [1.0, 3.0], - 'dataset 1': [1.4, 3.4], - 'dataset 2': [1.8, 3.8], + 'dataset 0': [1, 11], + 'dataset 1': [3, 13], + 'dataset 2': [5, 15], } - fig, ax = plt.subplots(figsize=(4, 2.2)) + fig, ax = plt.subplots() ax.grouped_bar(datasets, tick_labels=categories) ax.legend() diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index e10c1808176a..1ca2630e7166 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3039,22 +3039,20 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing """ Make a grouped bar plot. - .. note:: + .. versionadded:: 3.11 + This function is new in v3.11, and the API is still provisional. We may still fine-tune some aspects based on user-feedback. - This is a convenience function to plot bars for multiple datasets. - In particular, it simplifies positioning of the bars compared to individual - `~.Axes.bar` plots. - - Bar plots present categorical data as a sequence of bars, one bar per category. - We call one set of such values a *dataset* and it's bars all share the same - color. Grouped bar plots show multiple such datasets, where the values per - category are grouped together. The category names are drawn as tick labels - below the bar groups. Each dataset has a distinct bar color, and can optionally - get a label that is used for the legend. + Grouped bar charts visualize a collection of multiple categorical datasets. + A categorical dataset is a mapping *name* -> *value*. The values of the + dataset are represented by a sequence of bars of the same color. + In a grouped bar chart, the bars of all datasets are grouped together by + category. The category names are drawn as tick labels next to the bar group. + Each dataset has a distinct bar color, and can optionally get a label that + is used for the legend. - Here is an example call structure and the corresponding plot: + Example: .. code-block:: python @@ -3087,25 +3085,20 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing - dict of array-like: A mapping from names to datasets. Each dataset (dict value) must have the same number of elements. - This is similar to passing a list of array-like, with the addition that - each dataset gets a name. - Example call: .. code-block:: python - grouped_bar({'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2]}) + data_dict = {'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2} + grouped_bar(data_dict) - The names are used as *labels*, i.e. the following two calls are - equivalent: + The names are used as *labels*, i.e. this is equivalent to .. code-block:: python - data_dict = {'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2]} - grouped_bar(data_dict) grouped_bar(data_dict.values(), labels=data_dict.keys()) - When using a dict-like input, you must not pass *labels* explicitly. + When using a dict input, you must not pass *labels* explicitly. - a 2D array: The rows are the categories, the columns are the different datasets. @@ -3120,30 +3113,31 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing .. code-block:: python - group_labels = ["group_A", "group_B"] + categories = ["A", "B"] dataset_labels = ["dataset_0", "dataset_1", "dataset_2"] array = np.random.random((2, 3)) - - Note that this is consistent with pandas. These two calls produce - the same bar plot structure: - - .. code-block:: python - grouped_bar(array, tick_labels=categories, labels=dataset_labels) - df = pd.DataFrame(array, index=categories, columns=dataset_labels) - df.plot.bar() - a `pandas.DataFrame`. + The index is used for the categories, the columns are used for the + datasets. + .. code-block:: python df = pd.DataFrame( - np.random.random((2, 3)) - index=["group_A", "group_B"], + np.random.random((2, 3)), + index=["A", "B"], columns=["dataset_0", "dataset_1", "dataset_2"] ) grouped_bar(df) + i.e. this is equivalent to + + .. code-block:: + + grouped_bar(df.to_numpy(), tick_labels=df.index, labels=df.columns) + Note that ``grouped_bar(df)`` produces a structurally equivalent plot like ``df.plot.bar()``. @@ -3153,22 +3147,21 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing tick_labels : list of str, optional The category labels, which are placed on ticks at the center *positions* - of the bar groups. - - If not set, the axis ticks (positions and labels) are left unchanged. + of the bar groups. If not set, the axis ticks (positions and labels) are + left unchanged. labels : list of str, optional The labels of the datasets, i.e. the bars within one group. These will show up in the legend. group_spacing : float, default: 1.5 - The space between two bar groups in units of bar width. + The space between two bar groups as multiples of bar width. The default value of 1.5 thus means that there's a gap of 1.5 bar widths between bar groups. bar_spacing : float, default: 0 - The space between bars in units of bar width. + The space between bars as multiples of bar width. orientation : {"vertical", "horizontal"}, default: "vertical" The direction of the bars. @@ -3215,7 +3208,7 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing aspects. ``bar(x, y)`` is a lower-level API and places bars with height *y* at explicit positions *x*. It also allows to specify individual bar widths and colors. This kind of detailed control and flexibility is difficult to - manage and often not needed when plotting multiple datasets as grouped bar + manage and often not needed when plotting multiple datasets as a grouped bar plot. Therefore, ``grouped_bar`` focusses on the abstraction of bar plots as visualization of categorical data. @@ -3275,8 +3268,18 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing heights = heights.T num_datasets = len(heights) - dataset_0 = next(iter(heights)) - num_groups = len(dataset_0) + num_groups = len(next(iter(heights))) # inferred from first dataset + + # validate that all datasets have the same length, i.e. num_groups + # - can be skipped if heights is an array + if not hasattr(heights, 'shape'): + for i, dataset in enumerate(heights): + if len(dataset) != num_groups: + raise ValueError( + "'heights' contains datasets with different number of " + f"elements. dataset 0 has {num_groups} elements but " + f"dataset {i} has {len(dataset)} elements." + ) if positions is None: group_centers = np.arange(num_groups) @@ -3291,13 +3294,6 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing else: group_distance = 1 - for i, dataset in enumerate(heights): - if len(dataset) != num_groups: - raise ValueError( - f"'x' indicates {num_groups} groups, but dataset {i} " - f"has {len(dataset)} groups" - ) - _api.check_in_list(["vertical", "horizontal"], orientation=orientation) if colors is None: From 8cf06c487882f0270cb72810e56b7313603f63e3 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Sat, 1 Feb 2025 13:08:45 +0100 Subject: [PATCH 35/47] Docstring wording --- lib/matplotlib/axes/_axes.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index 1ca2630e7166..e6d392d0c191 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3041,16 +3041,17 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing .. versionadded:: 3.11 - This function is new in v3.11, and the API is still provisional. - We may still fine-tune some aspects based on user-feedback. - - Grouped bar charts visualize a collection of multiple categorical datasets. - A categorical dataset is a mapping *name* -> *value*. The values of the - dataset are represented by a sequence of bars of the same color. - In a grouped bar chart, the bars of all datasets are grouped together by - category. The category names are drawn as tick labels next to the bar group. - Each dataset has a distinct bar color, and can optionally get a label that - is used for the legend. + The API is still provisional. We may still fine-tune some aspects based on + user-feedback. + + Grouped bar charts visualize a collection of categorical datasets. Each value + in a dataset belongs to a distinct category and these categories are the same + across all datasets. The categories typically have string names, but could + also be dates or index keys. The values in each dataset are represented by a + sequence of bars of the same color. The bars of all datasets are grouped + together by their shared categories. The category names are drawn as the tick + labels for each bar group. Each dataset has a distinct bar color, and can + optionally get a label that is used for the legend. Example: From a4ed768b184a28a1725f4ffe2c0c2d963bc0ac52 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:27:34 +0100 Subject: [PATCH 36/47] Update lib/matplotlib/axes/_axes.py Co-authored-by: hannah --- lib/matplotlib/axes/_axes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index e6d392d0c191..d9dd17252e0b 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3074,10 +3074,10 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing .. code-block:: none - # category_A, category_B - dataset_0 = [ds0_A, ds0_B] - dataset_1 = [ds1_A, ds1_B] - dataset_2 = [ds2_A, ds2_B] + # category_A, category_B + dataset_0 = [value_0_A, value_0_B] + dataset_1 = [value_1_A, value_1_B] + dataset_2 = [value_2_A, value_2_B] Example call:: From d9aa5f64bae90654b05560afde48a2226f454e99 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 2 Jun 2025 16:06:33 +0200 Subject: [PATCH 37/47] Add test for grouped_bar() return value --- lib/matplotlib/axes/_axes.py | 2 +- lib/matplotlib/tests/test_axes.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index d9dd17252e0b..fa5ff198fe26 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -78,7 +78,7 @@ def __init__(self, bar_containers): self.bar_containers = bar_containers def remove(self): - [b.remove() for b in self.bars] + [b.remove() for b in self.bar_containers] @_docstring.interpd diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index e7158845307d..605e7b557713 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -23,6 +23,7 @@ from matplotlib import rc_context, patheffects import matplotlib.colors as mcolors import matplotlib.dates as mdates +from matplotlib.container import BarContainer from matplotlib.figure import Figure from matplotlib.axes import Axes from matplotlib.lines import Line2D @@ -2251,6 +2252,20 @@ def test_grouped_bar_dataframe(fig_test, fig_ref, pd): ax.legend() +def test_grouped_bar_return_value(): + fig, ax = plt.subplots() + ret = ax.grouped_bar([[1, 2, 3], [11, 12, 13]], tick_labels=['A', 'B', 'C']) + + assert len(ret.bar_containers) == 2 + for bc in ret.bar_containers: + assert isinstance(bc, BarContainer) + assert bc in ax.containers + + ret.remove() + for bc in ret.bar_containers: + assert bc not in ax.containers + + def test_boxplot_dates_pandas(pd): # smoke test for boxplot and dates in pandas data = np.random.rand(5, 2) From e0afe743127b4462df362148ba63537aa7980132 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 2 Jun 2025 16:16:22 +0200 Subject: [PATCH 38/47] Apply suggestions from code review --- lib/matplotlib/axes/_axes.py | 30 ++++++++++++++---------------- lib/matplotlib/axes/_axes.pyi | 13 +++++++------ lib/matplotlib/tests/test_axes.py | 8 ++++---- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index fa5ff198fe26..b4ed7ae22d35 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3057,9 +3057,9 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing .. code-block:: python - grouped_bar([dataset_1, dataset_2, dataset_3], + grouped_bar([dataset_0, dataset_1, dataset_2], tick_labels=['A', 'B'], - labels=['dataset 1', 'dataset 2', 'dataset 3']) + labels=['dataset 0', 'dataset 1', 'dataset 2']) .. plot:: _embedded_plots/grouped_bar.py @@ -3156,13 +3156,13 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing These will show up in the legend. group_spacing : float, default: 1.5 - The space between two bar groups as multiples of bar width. + The space between two bar groups as a multiple of bar width. The default value of 1.5 thus means that there's a gap of 1.5 bar widths between bar groups. bar_spacing : float, default: 0 - The space between bars as multiples of bar width. + The space between bars as a multiple of bar width. orientation : {"vertical", "horizontal"}, default: "vertical" The direction of the bars. @@ -3181,17 +3181,17 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing Returns ------- - _GroupedBarReturn + _GroupedBarReturn - A provisional result object. This will be refined in the future. - For now, the guaranteed API on the returned object is limited to + A provisional result object. This will be refined in the future. + For now, the guaranteed API on the returned object is limited to - - the attribute ``bar_containers``, which is a list of - `.BarContainer`, i.e. the results of the individual `~.Axes.bar` - calls for each dataset. + - the attribute ``bar_containers``, which is a list of + `.BarContainer`, i.e. the results of the individual `~.Axes.bar` + calls for each dataset. - - a ``remove()`` method, that remove all bars from the Axes. - See also `.Artist.remove()`. + - a ``remove()`` method, that remove all bars from the Axes. + See also `.Artist.remove()`. See Also -------- @@ -3261,8 +3261,7 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing heights = heights.to_numpy().T elif hasattr(heights, 'keys'): # dict if labels is not None: - raise ValueError( - "'labels' cannot be used if 'heights' are a mapping") + raise ValueError("'labels' cannot be used if 'heights' is a mapping") labels = heights.keys() heights = list(heights.values()) elif hasattr(heights, 'shape'): # numpy array @@ -3317,8 +3316,7 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing # place the bars, but only use numerical positions, categorical tick labels # are handled separately below bar_containers = [] - for i, (hs, label, color) in enumerate( - zip(heights, labels, colors)): + for i, (hs, label, color) in enumerate(zip(heights, labels, colors)): lefts = (group_centers - 0.5 * group_distance + margin_abs + i * (bar_width + bar_spacing_abs)) if orientation == "vertical": diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi index f606a65753f4..0008363b8220 100644 --- a/lib/matplotlib/axes/_axes.pyi +++ b/lib/matplotlib/axes/_axes.pyi @@ -41,6 +41,7 @@ import pandas as pd class _GroupedBarReturn: + bar_containers: list[BarContainer] def __init__(self, bar_containers: list[BarContainer]) -> None: ... def remove(self) -> None: ... @@ -273,13 +274,13 @@ class Axes(_AxesBase): ) -> PolyCollection: ... def grouped_bar( self, - heights : Sequence[ArrayLike] | dict[str, ArrayLike] | np.ndarray | pd.DataFrame, + heights: Sequence[ArrayLike] | dict[str, ArrayLike] | np.ndarray | pd.DataFrame, *, - positions : ArrayLike | None = ..., - tick_labels : Sequence[str] | None = ..., - labels : Sequence[str] | None = ..., - group_spacing : float | None = ..., - bar_spacing : float | None = ..., + positions: ArrayLike | None = ..., + tick_labels: Sequence[str] | None = ..., + labels: Sequence[str] | None = ..., + group_spacing: float | None = ..., + bar_spacing: float | None = ..., orientation: Literal["vertical", "horizontal"] = ..., colors: Iterable[ColorType] | None = ..., **kwargs diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 605e7b557713..ae2e91b811f1 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -2182,7 +2182,7 @@ def test_grouped_bar(): ax.set_yticks([]) -@check_figures_equal(extensions=["png"]) +@check_figures_equal() def test_grouped_bar_list_of_datasets(fig_test, fig_ref): categories = ['A', 'B'] data1 = [1, 1.2] @@ -2205,7 +2205,7 @@ def test_grouped_bar_list_of_datasets(fig_test, fig_ref): ax.legend() -@check_figures_equal(extensions=["png"]) +@check_figures_equal() def test_grouped_bar_dict_of_datasets(fig_test, fig_ref): categories = ['A', 'B'] data_dict = dict(data1=[1, 1.2], data2=[2, 2.4], data3=[3, 3.6]) @@ -2219,7 +2219,7 @@ def test_grouped_bar_dict_of_datasets(fig_test, fig_ref): ax.legend() -@check_figures_equal(extensions=["png"]) +@check_figures_equal() def test_grouped_bar_array(fig_test, fig_ref): categories = ['A', 'B'] array = np.array([[1, 2, 3], [1.2, 2.4, 3.6]]) @@ -2235,7 +2235,7 @@ def test_grouped_bar_array(fig_test, fig_ref): ax.legend() -@check_figures_equal(extensions=["png"]) +@check_figures_equal() def test_grouped_bar_dataframe(fig_test, fig_ref, pd): categories = ['A', 'B'] labels = ['data1', 'data2', 'data3'] From 150165be075bded5f51f8d16e197711fb706d4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trygve=20Magnus=20R=C3=A6der?= Date: Mon, 2 Jun 2025 22:22:14 +0200 Subject: [PATCH 39/47] Tiny update from code review --- galleries/users_explain/colors/colorbar_only.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/galleries/users_explain/colors/colorbar_only.py b/galleries/users_explain/colors/colorbar_only.py index 34de2bc78888..b956fae43a1b 100644 --- a/galleries/users_explain/colors/colorbar_only.py +++ b/galleries/users_explain/colors/colorbar_only.py @@ -11,7 +11,8 @@ A `~.Figure.colorbar` requires a `matplotlib.colorizer.ColorizingArtist` which contains a `matplotlib.colorizer.Colorizer` that holds the data-to-color pipeline (norm and colormap). To create a colorbar without an attached plot one can -use a `.ColorizingArtist` with no associated data. +directly instantiate the base class `.ColorizingArtist`, which has no associated +data. """ From 1426f6a2c4f0f300c75a3afb65f13101462e5638 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:25:00 +0200 Subject: [PATCH 40/47] DOC: Document the properties of Normalize --- lib/matplotlib/colors.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py index d6636e0e8669..dd5d22130904 100644 --- a/lib/matplotlib/colors.py +++ b/lib/matplotlib/colors.py @@ -2315,6 +2315,7 @@ def __init__(self, vmin=None, vmax=None, clip=False): @property def vmin(self): + """Lower limit of the input data interval; maps to 0.""" return self._vmin @vmin.setter @@ -2326,6 +2327,7 @@ def vmin(self, value): @property def vmax(self): + """Upper limit of the input data interval; maps to 1.""" return self._vmax @vmax.setter @@ -2337,6 +2339,11 @@ def vmax(self, value): @property def clip(self): + """ + Determines the behavior for mapping values outside the range ``[vmin, vmax]``. + + See the *clip* parameter in `.Normalize`. + """ return self._clip @clip.setter From 8ded1f06ba5f4ad16bfc98e5f17c8f21b931dc2a Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:46:05 +0200 Subject: [PATCH 41/47] DOC: Clarify that types in docstrings do not use formal type annotation syntax --- doc/devel/document.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/devel/document.rst b/doc/devel/document.rst index 20c30acf66aa..1119a265a80d 100644 --- a/doc/devel/document.rst +++ b/doc/devel/document.rst @@ -537,6 +537,10 @@ understandable by humans. If the possible types are too complex use a simplification for the type description and explain the type more precisely in the text. +We do not use formal type annotation syntax for type descriptions in +docstrings; e.g. we use ``list of str`` rather than ``list[str]``; we +use ``int or str`` rather than ``int | str`` or ``Union[int, str]``. + Generally, the `numpydoc docstring guide`_ conventions apply. The following rules expand on them where the numpydoc conventions are not specific. From 9861235c3494759d6a30a2309bcd669b9ec4fe39 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 4 Jun 2025 04:01:34 -0400 Subject: [PATCH 42/47] BLD: Remove FreeType from Agg backend extension I'm not sure why this was added originally, but it seems unnecessary. Fortunately, the waste was probably avoided by LTO. --- src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index a7018f0db094..d479a8b84aa2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -37,7 +37,7 @@ extension_data = { '_backend_agg.cpp', '_backend_agg_wrapper.cpp', ), - 'dependencies': [agg_dep, freetype_dep, pybind11_dep], + 'dependencies': [agg_dep, pybind11_dep], }, '_c_internal_utils': { 'subdir': 'matplotlib', From d43672a643fc5b5474ad0ebd1ce1a44200356490 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 4 Jun 2025 10:57:04 -0400 Subject: [PATCH 43/47] Make NavigationToolbar.configure_subplots return value consistent (#30130) When the subplot tool already exists, then it is shown, but never returned. This seems to be an accident. --- lib/matplotlib/backend_bases.py | 2 +- lib/matplotlib/backend_bases.pyi | 2 +- lib/matplotlib/tests/test_backend_qt.py | 4 +++- lib/matplotlib/tests/test_backend_tk.py | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index 2158990f578a..1992cc90ca26 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -3244,7 +3244,7 @@ def _update_view(self): def configure_subplots(self, *args): if hasattr(self, "subplot_tool"): self.subplot_tool.figure.canvas.manager.show() - return + return self.subplot_tool # This import needs to happen here due to circular imports. from matplotlib.figure import Figure with mpl.rc_context({"toolbar": "none"}): # No navbar for the toolfig. diff --git a/lib/matplotlib/backend_bases.pyi b/lib/matplotlib/backend_bases.pyi index 2d7b283bb4b8..0603988399f1 100644 --- a/lib/matplotlib/backend_bases.pyi +++ b/lib/matplotlib/backend_bases.pyi @@ -475,7 +475,7 @@ class NavigationToolbar2: def release_zoom(self, event: Event) -> None: ... def push_current(self) -> None: ... subplot_tool: widgets.SubplotTool - def configure_subplots(self, *args): ... + def configure_subplots(self, *args: Any) -> widgets.SubplotTool: ... def save_figure(self, *args) -> str | None | object: ... def update(self) -> None: ... def set_history_buttons(self) -> None: ... diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py index 60f8a4f49bb8..a17e98d70484 100644 --- a/lib/matplotlib/tests/test_backend_qt.py +++ b/lib/matplotlib/tests/test_backend_qt.py @@ -213,7 +213,9 @@ def set_device_pixel_ratio(ratio): def test_subplottool(): fig, ax = plt.subplots() with mock.patch("matplotlib.backends.qt_compat._exec", lambda obj: None): - fig.canvas.manager.toolbar.configure_subplots() + tool = fig.canvas.manager.toolbar.configure_subplots() + assert tool is not None + assert tool == fig.canvas.manager.toolbar.configure_subplots() @pytest.mark.backend('QtAgg', skip_on_importerror=True) diff --git a/lib/matplotlib/tests/test_backend_tk.py b/lib/matplotlib/tests/test_backend_tk.py index 1210c8c9993e..1f96ad1308cb 100644 --- a/lib/matplotlib/tests/test_backend_tk.py +++ b/lib/matplotlib/tests/test_backend_tk.py @@ -168,7 +168,9 @@ def test_never_update(): plt.show(block=False) plt.draw() # Test FigureCanvasTkAgg. - fig.canvas.toolbar.configure_subplots() # Test NavigationToolbar2Tk. + tool = fig.canvas.toolbar.configure_subplots() # Test NavigationToolbar2Tk. + assert tool is not None + assert tool == fig.canvas.toolbar.configure_subplots() # Tool is reused internally. # Test FigureCanvasTk filter_destroy callback fig.canvas.get_tk_widget().after(100, plt.close, fig) From 8abab038d76854bd117b65bfc635a5af2c324548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Wed, 4 Jun 2025 20:27:50 +0300 Subject: [PATCH 44/47] Keep a non-functional type1Descriptors --- lib/matplotlib/backends/backend_pdf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index c729b27b1b53..6f3cb8afa1ac 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -765,6 +765,7 @@ def __init__(self, filename, metadata=None): fontNames = _api.deprecated("3.11")(property(lambda self: self._fontNames)) dviFontInfo = _api.deprecated("3.11")(property(lambda self: self._dviFontInfo)) + type1Descriptors = _api.deprecated("3.11")(property(lambda _: {})) def newPage(self, width, height): self.endStream() From 0dc15a976f4f13973b8f2906500c322fc55ddbc1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 4 Jun 2025 20:54:21 -0400 Subject: [PATCH 45/47] js: Fix externally-controlled format strings CodeQL is now complaining about these. This should be okay since we only talk to ourselves, but better to be safe about it. --- lib/matplotlib/backends/web_backend/js/mpl.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/backends/web_backend/js/mpl.js b/lib/matplotlib/backends/web_backend/js/mpl.js index 2d1f383e9839..303260773a2f 100644 --- a/lib/matplotlib/backends/web_backend/js/mpl.js +++ b/lib/matplotlib/backends/web_backend/js/mpl.js @@ -575,7 +575,8 @@ mpl.figure.prototype._make_on_message_function = function (fig) { var callback = fig['handle_' + msg_type]; } catch (e) { console.log( - "No handler for the '" + msg_type + "' message type: ", + "No handler for the '%s' message type: ", + msg_type, msg ); return; @@ -583,11 +584,12 @@ mpl.figure.prototype._make_on_message_function = function (fig) { if (callback) { try { - // console.log("Handling '" + msg_type + "' message: ", msg); + // console.log("Handling '%s' message: ", msg_type, msg); callback(fig, msg); } catch (e) { console.log( - "Exception inside the 'handler_" + msg_type + "' callback:", + "Exception inside the 'handler_%s' callback:", + msg_type, e, e.stack, msg From f9d4ed29996d9300b7fa08a5add27aadd97eba05 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Sun, 18 May 2025 12:06:40 +0200 Subject: [PATCH 46/47] Remove deprecations: is_bbox and more --- .../next_api_changes/removals/30067-OG.rst | 23 +++++++++++++++ lib/matplotlib/backend_bases.py | 15 ++-------- lib/matplotlib/backend_bases.pyi | 2 +- lib/matplotlib/rcsetup.py | 28 +------------------ lib/matplotlib/rcsetup.pyi | 3 -- lib/matplotlib/tests/test_backend_registry.py | 11 -------- lib/matplotlib/transforms.py | 23 --------------- lib/matplotlib/transforms.pyi | 4 --- 8 files changed, 27 insertions(+), 82 deletions(-) create mode 100644 doc/api/next_api_changes/removals/30067-OG.rst diff --git a/doc/api/next_api_changes/removals/30067-OG.rst b/doc/api/next_api_changes/removals/30067-OG.rst new file mode 100644 index 000000000000..1a8d8bc5c2c5 --- /dev/null +++ b/doc/api/next_api_changes/removals/30067-OG.rst @@ -0,0 +1,23 @@ +``TransformNode.is_bbox`` +^^^^^^^^^^^^^^^^^^^^^^^^^ + +... is removed. Instead check the object using ``isinstance(..., BboxBase)``. + +``rcsetup.interactive_bk``, ``rcsetup.non_interactive_bk`` and ``rcsetup.all_backends`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +... are removed and replaced by ``matplotlib.backends.backend_registry.list_builtin`` +with the following arguments + +- ``matplotlib.backends.BackendFilter.INTERACTIVE`` +- ``matplotlib.backends.BackendFilter.NON_INTERACTIVE`` +- ``None`` + +``BboxTransformToMaxOnly`` +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +... is removed. It can be replaced by ``BboxTransformTo(LockableBbox(bbox, x0=0, y0=0))``. + +*interval* parameter of ``TimerBase.start`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +The timer interval parameter can no longer be set while starting it. The interval can be specified instead in the timer constructor, or by setting the timer.interval attribute. diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index 1992cc90ca26..527d8c010710 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -1067,19 +1067,8 @@ def __del__(self): """Need to stop timer and possibly disconnect timer.""" self._timer_stop() - @_api.delete_parameter("3.9", "interval", alternative="timer.interval") - def start(self, interval=None): - """ - Start the timer object. - - Parameters - ---------- - interval : int, optional - Timer interval in milliseconds; overrides a previously set interval - if provided. - """ - if interval is not None: - self.interval = interval + def start(self): + """Start the timer.""" self._timer_start() def stop(self): diff --git a/lib/matplotlib/backend_bases.pyi b/lib/matplotlib/backend_bases.pyi index 0603988399f1..24669bfb3aeb 100644 --- a/lib/matplotlib/backend_bases.pyi +++ b/lib/matplotlib/backend_bases.pyi @@ -186,7 +186,7 @@ class TimerBase: callbacks: list[tuple[Callable, tuple, dict[str, Any]]] | None = ..., ) -> None: ... def __del__(self) -> None: ... - def start(self, interval: int | None = ...) -> None: ... + def start(self) -> None: ... def stop(self) -> None: ... @property def interval(self) -> int: ... diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py index ce29c5076100..02e3601ff4c2 100644 --- a/lib/matplotlib/rcsetup.py +++ b/lib/matplotlib/rcsetup.py @@ -24,7 +24,7 @@ import matplotlib as mpl from matplotlib import _api, cbook -from matplotlib.backends import BackendFilter, backend_registry +from matplotlib.backends import backend_registry from matplotlib.cbook import ls_mapper from matplotlib.colors import Colormap, is_color_like from matplotlib._fontconfig_pattern import parse_fontconfig_pattern @@ -34,32 +34,6 @@ from cycler import Cycler, cycler as ccycler -@_api.caching_module_getattr -class __getattr__: - @_api.deprecated( - "3.9", - alternative="``matplotlib.backends.backend_registry.list_builtin" - "(matplotlib.backends.BackendFilter.INTERACTIVE)``") - @property - def interactive_bk(self): - return backend_registry.list_builtin(BackendFilter.INTERACTIVE) - - @_api.deprecated( - "3.9", - alternative="``matplotlib.backends.backend_registry.list_builtin" - "(matplotlib.backends.BackendFilter.NON_INTERACTIVE)``") - @property - def non_interactive_bk(self): - return backend_registry.list_builtin(BackendFilter.NON_INTERACTIVE) - - @_api.deprecated( - "3.9", - alternative="``matplotlib.backends.backend_registry.list_builtin()``") - @property - def all_backends(self): - return backend_registry.list_builtin() - - class ValidateInStrings: def __init__(self, key, valid, ignorecase=False, *, _deprecated_since=None): diff --git a/lib/matplotlib/rcsetup.pyi b/lib/matplotlib/rcsetup.pyi index 79538511c0e4..eb1d7c9f3a33 100644 --- a/lib/matplotlib/rcsetup.pyi +++ b/lib/matplotlib/rcsetup.pyi @@ -4,9 +4,6 @@ from collections.abc import Callable, Iterable from typing import Any, Literal, TypeVar from matplotlib.typing import ColorType, LineStyleType, MarkEveryType -interactive_bk: list[str] -non_interactive_bk: list[str] -all_backends: list[str] _T = TypeVar("_T") diff --git a/lib/matplotlib/tests/test_backend_registry.py b/lib/matplotlib/tests/test_backend_registry.py index 80c2ce4fc51a..2bd8e161bd6b 100644 --- a/lib/matplotlib/tests/test_backend_registry.py +++ b/lib/matplotlib/tests/test_backend_registry.py @@ -3,7 +3,6 @@ import pytest -import matplotlib as mpl from matplotlib.backends import BackendFilter, backend_registry @@ -95,16 +94,6 @@ def test_backend_normalization(backend, normalized): assert backend_registry._backend_module_name(backend) == normalized -def test_deprecated_rcsetup_attributes(): - match = "was deprecated in Matplotlib 3.9" - with pytest.warns(mpl.MatplotlibDeprecationWarning, match=match): - mpl.rcsetup.interactive_bk - with pytest.warns(mpl.MatplotlibDeprecationWarning, match=match): - mpl.rcsetup.non_interactive_bk - with pytest.warns(mpl.MatplotlibDeprecationWarning, match=match): - mpl.rcsetup.all_backends - - def test_entry_points_inline(): pytest.importorskip('matplotlib_inline') backends = backend_registry.list_all() diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py index 2cca56f04457..7228f05bcf9e 100644 --- a/lib/matplotlib/transforms.py +++ b/lib/matplotlib/transforms.py @@ -98,7 +98,6 @@ class TransformNode: # Some metadata about the transform, used to determine whether an # invalidation is affine-only is_affine = False - is_bbox = _api.deprecated("3.9")(_api.classproperty(lambda cls: False)) pass_through = False """ @@ -216,7 +215,6 @@ class BboxBase(TransformNode): and height, but these are not stored explicitly. """ - is_bbox = _api.deprecated("3.9")(_api.classproperty(lambda cls: True)) is_affine = True if DEBUG: @@ -2627,27 +2625,6 @@ def get_matrix(self): return self._mtx -@_api.deprecated("3.9") -class BboxTransformToMaxOnly(BboxTransformTo): - """ - `BboxTransformToMaxOnly` is a transformation that linearly transforms points from - the unit bounding box to a given `Bbox` with a fixed upper left of (0, 0). - """ - def get_matrix(self): - # docstring inherited - if self._invalid: - xmax, ymax = self._boxout.max - if DEBUG and (xmax == 0 or ymax == 0): - raise ValueError("Transforming to a singular bounding box.") - self._mtx = np.array([[xmax, 0.0, 0.0], - [ 0.0, ymax, 0.0], - [ 0.0, 0.0, 1.0]], - float) - self._inverted = None - self._invalid = 0 - return self._mtx - - class BboxTransformFrom(Affine2DBase): """ `BboxTransformFrom` linearly transforms points from a given `Bbox` to the diff --git a/lib/matplotlib/transforms.pyi b/lib/matplotlib/transforms.pyi index 551487a11c60..07d299be297c 100644 --- a/lib/matplotlib/transforms.pyi +++ b/lib/matplotlib/transforms.pyi @@ -12,7 +12,6 @@ class TransformNode: INVALID_NON_AFFINE: int INVALID_AFFINE: int INVALID: int - is_bbox: bool # Implemented as a standard attr in base class, but functionally readonly and some subclasses implement as such @property def is_affine(self) -> bool: ... @@ -24,7 +23,6 @@ class TransformNode: def frozen(self) -> TransformNode: ... class BboxBase(TransformNode): - is_bbox: bool is_affine: bool def frozen(self) -> Bbox: ... def __array__(self, *args, **kwargs): ... @@ -295,8 +293,6 @@ class BboxTransform(Affine2DBase): class BboxTransformTo(Affine2DBase): def __init__(self, boxout: BboxBase, **kwargs) -> None: ... -class BboxTransformToMaxOnly(BboxTransformTo): ... - class BboxTransformFrom(Affine2DBase): def __init__(self, boxin: BboxBase, **kwargs) -> None: ... From d5ab3b02bbaf05ee2998803150b3e2444980ca3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Thu, 5 Jun 2025 06:46:25 +0300 Subject: [PATCH 47/47] Install extra TeX fonts on one runner only The DejaVu and Heuristica fonts are used by the type-1 font subsetting tests. Heuristica has a Cyrillic encoding and apparently cannot be loaded without installing texlive-lang-cyrillic. --- .github/workflows/tests.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a197a9d4aa8..2a48276707ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -64,8 +64,10 @@ jobs: python-version: '3.12' # https://github.com/matplotlib/matplotlib/issues/29844 pygobject-ver: '<3.52.0' - - os: ubuntu-22.04 + - name-suffix: "(Extra TeX packages)" + os: ubuntu-22.04 python-version: '3.13' + extra-packages: 'texlive-fonts-extra texlive-lang-cyrillic' # https://github.com/matplotlib/matplotlib/issues/29844 pygobject-ver: '<3.52.0' - name-suffix: "Free-threaded" @@ -142,7 +144,8 @@ jobs: texlive-latex-recommended \ texlive-luatex \ texlive-pictures \ - texlive-xetex + texlive-xetex \ + ${{ matrix.extra-packages }} if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils fi